diff options
Diffstat (limited to 'mcs/class/System.Web/System.Web.UI.WebControls/Content.cs')
| -rw-r--r-- | mcs/class/System.Web/System.Web.UI.WebControls/Content.cs | 54 |
1 files changed, 5 insertions, 49 deletions
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 57ed42702be..a6011121e13 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/Content.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/Content.cs @@ -37,7 +37,11 @@ namespace System.Web.UI.WebControls { [ToolboxItem (false)] [DesignerAttribute ("System.Web.UI.Design.WebControls.ContentDesigner, " + Consts.AssemblySystem_Design, "System.ComponentModel.Design.IDesigner")] - [ControlBuilder(typeof(ContentBuilderInternal))] +#if notyet + [ControlBuilder(typeof(ContentControlBuilderInternal))] /* XXX ew, this is in beta2 - an internal builder? */ +#else + [ControlBuilder(typeof(ContentControlBuilder))] +#endif public class Content: Control, INamingContainer { string placeHolderId; @@ -50,54 +54,6 @@ namespace System.Web.UI.WebControls get { return placeHolderId; } set { placeHolderId = value; } } - - static readonly object DataBindingEvent = new object (); - [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)] - [Browsable (false)] - public new event EventHandler DataBinding { - add { Events.AddHandler (DataBindingEvent, value); } - remove { Events.RemoveHandler (DataBindingEvent, value); } - } - - static readonly object DisposedEvent = new object (); - [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)] - [Browsable (false)] - public new event EventHandler Disposed { - add { Events.AddHandler (DisposedEvent, value); } - remove { Events.RemoveHandler (DisposedEvent, value); } - } - - static readonly object InitEvent = new object (); - [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)] - [Browsable (false)] - public new event EventHandler Init { - add { Events.AddHandler (InitEvent, value); } - remove { Events.RemoveHandler (InitEvent, value); } - } - - static readonly object LoadEvent = new object (); - [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)] - [Browsable (false)] - public new event EventHandler Load { - add { Events.AddHandler (LoadEvent, value); } - remove { Events.RemoveHandler (LoadEvent, value); } - } - - static readonly object PreRenderEvent = new object (); - [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)] - [Browsable (false)] - public new event EventHandler PreRender { - add { Events.AddHandler (PreRenderEvent, value); } - remove { Events.RemoveHandler (PreRenderEvent, value); } - } - - static readonly object UnloadEvent = new object (); - [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)] - [Browsable (false)] - public new event EventHandler Unload { - add { Events.AddHandler (UnloadEvent, value); } - remove { Events.RemoveHandler (UnloadEvent, value); } - } } } |