2010-03-12 Jb Evain <jbevain@novell.com>

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

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/Content.cs b/mcs/class/System.Web/System.Web.UI.WebControls/Content.cs
index a6011121e1335437de7a0b323fc615f77a4f5016..e61a9bc4419602d62134d10631e3a7c60268b058 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/Content.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/Content.cs
@@ -37,22 +37,60 @@ namespace System.Web.UI.WebControls
 {
        [ToolboxItem (false)]
        [DesignerAttribute ("System.Web.UI.Design.WebControls.ContentDesigner, " + Consts.AssemblySystem_Design, "System.ComponentModel.Design.IDesigner")]
-#if notyet
-       [ControlBuilder(typeof(ContentControlBuilderInternal))]  /* XXX ew, this is in beta2 - an internal builder? */
-#else
-       [ControlBuilder(typeof(ContentControlBuilder))] 
+#if !TARGET_JVM
+       [ControlBuilder(typeof(ContentBuilderInternal))]
 #endif
-       public class Content: Control, INamingContainer
+       public class Content: Control, INamingContainer, INonBindingContainer
        {
-               string placeHolderId;
-               
                [ThemeableAttribute (false)]
                [DefaultValueAttribute ("")]
                [WebCategoryAttribute ("Behavior")]
                [IDReferencePropertyAttribute (typeof(ContentPlaceHolder))]
                public string ContentPlaceHolderID {
-                       get { return placeHolderId; }
-                       set { placeHolderId = value; }
+                       get { return String.Empty; }
+                       set { throw new NotSupportedException (); }
+               }
+
+               [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
+               [Browsable (false)]
+               public new event EventHandler DataBinding {
+                       add { base.DataBinding += value; }
+                       remove { base.DataBinding -= value; }
+               }
+
+               [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
+               [Browsable (false)]
+               public new event EventHandler Disposed {
+                       add { base.Disposed += value; }
+                       remove { base.Disposed -= value; }
+               }
+
+               [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
+               [Browsable (false)]
+               public new event EventHandler Init {
+                       add { base.Init += value; }
+                       remove { base.Init -= value; }
+               }
+
+               [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
+               [Browsable (false)]
+               public new event EventHandler Load {
+                       add { base.Load += value; }
+                       remove { base.Load -= value; }
+               }
+
+               [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
+               [Browsable (false)]
+               public new event EventHandler PreRender {
+                       add { base.PreRender += value; }
+                       remove { base.PreRender -= value; }
+               }
+
+               [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
+               [Browsable (false)]
+               public new event EventHandler Unload {
+                       add { base.Unload += value; ; }
+                       remove { base.Unload -= value; }
                }
        }
 }