ensure the tests files are in sync; see run-mono-tests.bat diff

[mono.git] / mcs / class / System.Web / System.Web.UI / UserControl.cs

diff --git a/mcs/class/System.Web/System.Web.UI/UserControl.cs b/mcs/class/System.Web/System.Web.UI/UserControl.cs
index 298e0653daab202472fb8e063a6f7d0b8ac6ab2d..c5f405cec62283a1b9626e8e4648a3ae0aa875c2 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/UserControl.cs
+++ b/mcs/class/System.Web/System.Web.UI/UserControl.cs
@@ -45,12 +45,11 @@ namespace System.Web.UI {
        [DefaultEvent ("Load"), DesignerCategory ("ASPXCodeBehind")]
        [ToolboxItem (false)]
        [Designer ("System.Web.UI.Design.UserControlDesigner, " + Consts.AssemblySystem_Design, typeof (IDesigner))]
+       [ParseChildren (true)]
 #if NET_2_0
        [Designer ("Microsoft.VisualStudio.Web.WebForms.WebFormDesigner, " + Consts.AssemblyMicrosoft_VisualStudio_Web, typeof (IRootDesigner))]
-       [ParseChildren (true, "", ChildControlType = typeof (Control))]
 #else
        [RootDesignerSerializer ("Microsoft.VSDesigner.WebForms.RootCodeDomSerializer, " + Consts.AssemblyMicrosoft_VSDesigner, "System.ComponentModel.Design.Serialization.CodeDomSerializer, " + Consts.AssemblySystem_Design, true)]
-       [ParseChildren (true)]
 #endif
        public class UserControl : TemplateControl, IAttributeAccessor, IUserControlDesignerAccessor
 #if NET_2_0
@@ -203,8 +202,15 @@ namespace System.Web.UI {
                {
                        if (initialized)
                                return;
-                       initialized = true;
                        this.Page = page;
+                       InitializeAsUserControlInternal ();
+               }
+
+               internal void InitializeAsUserControlInternal ()
+               {
+                       if (initialized)
+                               return;
+                       initialized = true;
                        WireupAutomaticEvents ();
                        FrameworkInitialize ();
                }
@@ -285,13 +291,13 @@ namespace System.Web.UI {
                        set { ViewState["!DesignTimeTagName"] = value; }
                }
 #if NET_2_0
-               [MonoTODO]
+               [MonoTODO ("Not implemented")]
                int IFilterResolutionService.CompareFilters (string filter1, string filter2)
                {
                        throw new NotImplementedException ();
                }
 
-               [MonoTODO]
+               [MonoTODO ("Not implemented")]
                bool IFilterResolutionService.EvaluateFilter (string filterName)
                {
                        throw new NotImplementedException ();