diff options
| author | Chris Toshok <toshok@novell.com> | 2006-02-27 22:47:05 +0300 |
|---|---|---|
| committer | Chris Toshok <toshok@novell.com> | 2006-02-27 22:47:05 +0300 |
| commit | 200f34ab9a1bd229e061dbf1803020b0ee009ef5 (patch) | |
| tree | d835661dc0ab137ba8c38f95b2a0ce629dd718c2 /mcs | |
| parent | c578941eaf36d6795547502d844c3ca1d889ae10 (diff) | |
* ListSourceHelper.cs: this class is static.
* Page.cs: add some EditorBrowsable attributes to the 2.0 events.
2006-02-27 Chris Toshok <toshok@ximian.com>
svn path=/trunk/mcs/; revision=57348
Diffstat (limited to 'mcs')
| -rw-r--r-- | mcs/class/System.Web/System.Web.UI/ChangeLog | 6 | ||||
| -rw-r--r-- | mcs/class/System.Web/System.Web.UI/ListSourceHelper.cs | 4 | ||||
| -rw-r--r-- | mcs/class/System.Web/System.Web.UI/Page.cs | 8 |
3 files changed, 15 insertions, 3 deletions
diff --git a/mcs/class/System.Web/System.Web.UI/ChangeLog b/mcs/class/System.Web/System.Web.UI/ChangeLog index d095829ff9c..ece5f6e1924 100644 --- a/mcs/class/System.Web/System.Web.UI/ChangeLog +++ b/mcs/class/System.Web/System.Web.UI/ChangeLog @@ -1,5 +1,11 @@ 2006-02-27 Chris Toshok <toshok@ximian.com> + * ListSourceHelper.cs: this class is static. + + * Page.cs: add some EditorBrowsable attributes to the 2.0 events. + +2006-02-27 Chris Toshok <toshok@ximian.com> + * DataSourceView.cs: Name isn't virtual. * DataSourceControl.cs: beat this class over the head with the diff --git a/mcs/class/System.Web/System.Web.UI/ListSourceHelper.cs b/mcs/class/System.Web/System.Web.UI/ListSourceHelper.cs index d423f9e47de..bbc2808ee23 100644 --- a/mcs/class/System.Web/System.Web.UI/ListSourceHelper.cs +++ b/mcs/class/System.Web/System.Web.UI/ListSourceHelper.cs @@ -34,9 +34,7 @@ using System.Collections.Specialized; using System.Text; namespace System.Web.UI { - public sealed class ListSourceHelper { - private ListSourceHelper () {} - + public static class ListSourceHelper { [MonoTODO] public static bool ContainsListCollection (IDataSource dataSource) { diff --git a/mcs/class/System.Web/System.Web.UI/Page.cs b/mcs/class/System.Web/System.Web.UI/Page.cs index a6648721050..54cc0cffd9e 100644 --- a/mcs/class/System.Web/System.Web.UI/Page.cs +++ b/mcs/class/System.Web/System.Web.UI/Page.cs @@ -320,6 +320,9 @@ public class Page : TemplateControl, IHttpHandler } [Browsable (false)] +#if NET_2_0 + [EditorBrowsable (EditorBrowsableState.Never)] +#endif public override string ID { get { return base.ID; } @@ -1366,6 +1369,7 @@ public class Page : TemplateControl, IHttpHandler const int prerendercomplete_mask = 1 << 4; const int savestatecomplete_mask = 1 << 5; + [EditorBrowsable (EditorBrowsableState.Advanced)] public event EventHandler InitComplete { add { event_mask |= initcomplete_mask; @@ -1374,6 +1378,7 @@ public class Page : TemplateControl, IHttpHandler remove { Events.RemoveHandler (InitCompleteEvent, value); } } + [EditorBrowsable (EditorBrowsableState.Advanced)] public event EventHandler LoadComplete { add { event_mask |= loadcomplete_mask; @@ -1390,6 +1395,7 @@ public class Page : TemplateControl, IHttpHandler remove { Events.RemoveHandler (PreInitEvent, value); } } + [EditorBrowsable (EditorBrowsableState.Advanced)] public event EventHandler PreLoad { add { event_mask |= preload_mask; @@ -1398,6 +1404,7 @@ public class Page : TemplateControl, IHttpHandler remove { Events.RemoveHandler (PreLoadEvent, value); } } + [EditorBrowsable (EditorBrowsableState.Advanced)] public event EventHandler PreRenderComplete { add { event_mask |= prerendercomplete_mask; @@ -1406,6 +1413,7 @@ public class Page : TemplateControl, IHttpHandler remove { Events.RemoveHandler (PreRenderCompleteEvent, value); } } + [EditorBrowsable (EditorBrowsableState.Advanced)] public event EventHandler SaveStateComplete { add { event_mask |= savestatecomplete_mask; |