* ContentPlaceHolder.cs: fix ToolboxDataAttribute.
* Content.cs: use ContentControlBuilderInternal, and add a bunch
of unused (for now) EventHandler's here.
* ContentControlBuilderInternal.cs: rename ContentControlBuilder
to this.
svn path=/trunk/mcs/; revision=56621
++2006-02-07 Chris Toshok <toshok@ximian.com>
++
++ * ContentPlaceHolder.cs: fix ToolboxDataAttribute.
++
++ * Content.cs: use ContentControlBuilderInternal, and add a bunch
++ of unused (for now) EventHandler's here.
++
++ * ContentControlBuilderInternal.cs: rename ContentControlBuilder
++ to this.
++
2006-01-24 Gonzalo Paniagua Javier <gonzalo@ximian.com>
* ListControl.cs: bound checking for Items when loading the control
{
[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))]
--#endif
++ [ControlBuilder(typeof(ContentControlBuilderInternal))]
public class Content: Control, INamingContainer
{
string placeHolderId;
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); }
++ }
}
}
+++ /dev/null
--//
--// System.Web.UI.WebControls.Content.cs
--//
--// Authors:
--// Lluis Sanchez Gual (lluis@novell.com)
--//
--// (C) 2005 Novell, Inc.
--//
--
--//
--// Permission is hereby granted, free of charge, to any person obtaining
--// a copy of this software and associated documentation files (the
--// "Software"), to deal in the Software without restriction, including
--// without limitation the rights to use, copy, modify, merge, publish,
--// distribute, sublicense, and/or sell copies of the Software, and to
--// permit persons to whom the Software is furnished to do so, subject to
--// the following conditions:
--//
--// The above copyright notice and this permission notice shall be
--// included in all copies or substantial portions of the Software.
--//
--// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
--// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
--// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
--// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
--// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
--// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
--// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--//
--
--#if NET_2_0
--
--using System;
--using System.Collections;
--using System.Web.UI.WebControls;
--
--namespace System.Web.UI
--{
-- internal class ContentControlBuilder: TemplateBuilder
-- {
-- string placeHolderID;
--
-- public override void Init (TemplateParser parser,
-- ControlBuilder parentBuilder,
-- Type type,
-- string tagName,
-- string ID,
-- IDictionary attribs)
-- {
-- base.Init (parser, parentBuilder, type, tagName, ID, attribs);
-- placeHolderID = attribs ["ContentPlaceHolderID"] as string;
-- }
--
-- public string ContentPlaceHolderID {
-- get { return placeHolderID; }
-- }
-- }
--}
--
--#endif
--- /dev/null
--- /dev/null
++//
++// System.Web.UI.WebControls.ContentControlBuilderInternal.cs
++//
++// Authors:
++// Lluis Sanchez Gual (lluis@novell.com)
++//
++// (C) 2005 Novell, Inc.
++//
++
++//
++// Permission is hereby granted, free of charge, to any person obtaining
++// a copy of this software and associated documentation files (the
++// "Software"), to deal in the Software without restriction, including
++// without limitation the rights to use, copy, modify, merge, publish,
++// distribute, sublicense, and/or sell copies of the Software, and to
++// permit persons to whom the Software is furnished to do so, subject to
++// the following conditions:
++//
++// The above copyright notice and this permission notice shall be
++// included in all copies or substantial portions of the Software.
++//
++// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
++// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
++// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
++// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++//
++
++#if NET_2_0
++
++using System;
++using System.Collections;
++using System.Web.UI.WebControls;
++
++namespace System.Web.UI
++{
++ internal class ContentControlBuilderInternal: TemplateBuilder
++ {
++ string placeHolderID;
++
++ public override void Init (TemplateParser parser,
++ ControlBuilder parentBuilder,
++ Type type,
++ string tagName,
++ string ID,
++ IDictionary attribs)
++ {
++ base.Init (parser, parentBuilder, type, tagName, ID, attribs);
++ placeHolderID = attribs ["ContentPlaceHolderID"] as string;
++ }
++
++ public string ContentPlaceHolderID {
++ get { return placeHolderID; }
++ }
++ }
++}
++
++#endif
[ToolboxItemFilterAttribute ("Microsoft.VisualStudio.Web.WebForms.MasterPageWebFormDesigner", ToolboxItemFilterType.Require)]
[ToolboxItemFilterAttribute ("System.Web.UI", ToolboxItemFilterType.Allow)]
[DesignerAttribute ("System.Web.UI.Design.WebControls.ContentPlaceHolderDesigner, " + Consts.AssemblySystem_Design, "System.ComponentModel.Design.IDesigner")]
-- [ToolboxDataAttribute ("<{0}:ContentPlaceHolder runat='server'></{0}:ContentPlaceHolder>")]
++ [ToolboxDataAttribute ("<{0}:ContentPlaceHolder runat="server"></{0}:ContentPlaceHolder>")]
[ControlBuilder(typeof(ContentPlaceHolderBuilder))]
public class ContentPlaceHolder: Control, INamingContainer
{
projects / mono.git / commitdiff