2004-01-11 Andreas Nahr <ClassDevelopment@A-SoftTech.com>

	* UserControl.cs: Added missing attribute, implemented method
	* Page.cs: Added missing attribute, implemented method

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

diff --git a/mcs/class/System.Web/System.Web.UI/ChangeLog b/mcs/class/System.Web/System.Web.UI/ChangeLog
index 6efe4bf482cc23b395057f692a0fef904a05de1d..e6275607c711910d5b02a772582dd470aca0a25b 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-11  Andreas Nahr <ClassDevelopment@A-SoftTech.com>
+
+       * UserControl.cs: Added missing attribute, implemented method
+       * Page.cs: Added missing attribute, implemented method
+
 2004-01-10  Jackson Harper <jackson@ximian.com>
 
        * Page.cs: Handle trace being enabled in the config file.

diff --git a/mcs/class/System.Web/System.Web.UI/Page.cs b/mcs/class/System.Web/System.Web.UI/Page.cs
index c156c73b5d50ee91e02e0824511d78e6b3713cbd..7c057a05b98d93308fd5e248af5aed8c18562a86 100755 (executable)
--- a/mcs/class/System.Web/System.Web.UI/Page.cs
+++ b/mcs/class/System.Web/System.Web.UI/Page.cs
@@ -29,7 +29,7 @@ using System.Web.Util;
 namespace System.Web.UI
 {
 
-// TODO FIXME missing the IRootDesigner Attribute
+[MonoTODO ("FIXME missing the IRootDesigner Attribute")]
 [DefaultEvent ("Load"), DesignerCategory ("ASPXCodeBehind")]
 [ToolboxItem (false)]
 [Designer ("System.Web.UI.Design.ControlDesigner, " + Consts.AssemblySystem_Design, typeof (IDesigner))]
@@ -304,6 +304,7 @@ public class Page : TemplateControl, IHttpHandler
        }
 
        [MonoTODO ("Use this when encrypting/decrypting ViewState")]
+       [Browsable (false)]
        public string ViewStateUserKey {
                get { return viewStateUserKey; }
                set { viewStateUserKey = value; }
@@ -340,11 +341,10 @@ public class Page : TemplateControl, IHttpHandler
                return new HtmlTextWriter (tw);
        }
 
-       [MonoTODO]
        [EditorBrowsable (EditorBrowsableState.Never)]
        public void DesignerInitialize ()
        {
-               throw new NotImplementedException ();
+               InitRecursive (null);
        }
 
        [EditorBrowsable (EditorBrowsableState.Advanced)]

diff --git a/mcs/class/System.Web/System.Web.UI/UserControl.cs b/mcs/class/System.Web/System.Web.UI/UserControl.cs
index 7270cb174cc02ffaec0a49e23ff838015063e379..a19843cab42dd3c37b1931eddfa6d1b3003e3f81 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/UserControl.cs
+++ b/mcs/class/System.Web/System.Web.UI/UserControl.cs
@@ -20,6 +20,7 @@ namespace System.Web.UI
        [DefaultEvent ("Load"), DesignerCategory ("ASPXCodeBehind")]
        [ToolboxItem (false), ParseChildren (true)]
        [Designer ("System.Web.UI.Design.UserControlDesigner, " + Consts.AssemblySystem_Design, typeof (IDesigner))]
+       [Designer ("Microsoft.VSDesigner.WebForms.WebFormDesigner, " + Consts.AssemblyMicrosoft_VSDesigner, typeof (IRootDesigner))]
        [RootDesignerSerializer ("Microsoft.VSDesigner.WebForms.RootCodeDomSerializer, " + Consts.AssemblyMicrosoft_VSDesigner, "System.ComponentModel.Design.Serialization.CodeDomSerializer, " + Consts.AssemblySystem_Design, true)]
        public class UserControl : TemplateControl, IAttributeAccessor, IUserControlDesignerAccessor
        {
@@ -147,11 +148,10 @@ namespace System.Web.UI
                        }
                }
 
-               [MonoTODO]
                [EditorBrowsable (EditorBrowsableState.Never)]
                public void DesignerInitialize ()
                {
-                       throw new NotImplementedException ();
+                       InitRecursive (null);
                }
 
                [EditorBrowsable (EditorBrowsableState.Never)]