* Control.cs: Ensure that dynamically loaded controls are

	initialized.

svn path=/trunk/mcs/; revision=22618

diff --git a/mcs/class/System.Web/System.Web.UI/ChangeLog b/mcs/class/System.Web/System.Web.UI/ChangeLog
index 82b293a2cd724585bbfbd4900b030d0f715f3f97..68c324bb22504883bbe0df12a9660a1f47935de4 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/ChangeLog
+++ b/mcs/class/System.Web/System.Web.UI/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-30  Jackson Harper <jackson@ximian.com>
+
+       * Control.cs: Ensure that dynamically loaded controls are
+       initialized.
+       
 2004-01-28  Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
        * ApplicationFileParser.cs: check for error in directives. Use

diff --git a/mcs/class/System.Web/System.Web.UI/Control.cs b/mcs/class/System.Web/System.Web.UI/Control.cs
index 93c737a1fcc9b1449048a063ad5611cbf11c5e85..6a3fa648ce22af7a99e87e361cf840e49d7329a3 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/Control.cs
+++ b/mcs/class/System.Web/System.Web.UI/Control.cs
@@ -57,7 +57,7 @@ namespace System.Web.UI
                private bool bindingContainer = true;
                private bool autoEventWireup = true;
 
-               bool inited;
+               bool inited, initing;
                bool viewStateLoaded;
                bool loaded;
                bool prerendered;
@@ -377,7 +377,7 @@ namespace System.Web.UI
                                        control._userId =  nc.GetDefaultName () + "a";
                        }
 
-                       if (inited)
+                       if (initing || inited)
                                control.InitRecursive (nc);
 
                        if (viewStateLoaded || loaded) {
@@ -829,9 +829,11 @@ namespace System.Web.UI
                                }\r
                        }\r
 \r
+                       initing = true;
                         OnInit (EventArgs.Empty);\r
                        TrackViewState ();\r
                        inited = true;\r
+                       initing = false;
                 }\r
 
                 internal object SaveViewStateRecursive ()