2002-06-30 Gonzalo Paniagua Javier <gonzalo@ximian.com>

	* DataGridColumn.cs:
	* DataGridPagerStyle.cs:
	* DataList.cs:
	* DataListItem.cs:
	* Image.cs:
	* LinkButton.cs:
	* ListControl.cs:
	* ListItem.cs:
	* ListItemCollection.cs:
	* Repeater.cs:
	* ServerValidateEventArgs.cs:
	* Style.cs:
	* TableRow.cs:
	* WebControl.cs:
	* Xml.cs: more class status page based changes.

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

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog b/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
index cdf949f1513499227df24321e97f3bd7e546694a..b52b572e5fa31d7aece0b8644759187209108ce6 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
@@ -1,3 +1,21 @@
+2002-06-30  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+       * DataGridColumn.cs:
+       * DataGridPagerStyle.cs:
+       * DataList.cs:
+       * DataListItem.cs:
+       * Image.cs:
+       * LinkButton.cs:
+       * ListControl.cs:
+       * ListItem.cs:
+       * ListItemCollection.cs:
+       * Repeater.cs:
+       * ServerValidateEventArgs.cs:
+       * Style.cs:
+       * TableRow.cs:
+       * WebControl.cs:
+       * Xml.cs: more class status page based changes.
+
 2002-06-29  Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
        * Button.cs:

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DataGridColumn.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DataGridColumn.cs
index c0adca881d983580acb2f75872a114924f35a74d..66607086a4642dc8e574fdbb4b07286d1b2c6c1a 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/DataGridColumn.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/DataGridColumn.cs
@@ -294,7 +294,7 @@ namespace System.Web.UI.WebControls
                /// <summary>\r
                /// Undocumented\r
                /// </summary>\r
-               protected void OnColumnChanged()\r
+               protected virtual void OnColumnChanged()\r
                {\r
                        if(owner != null)\r
                        {\r
@@ -345,7 +345,7 @@ namespace System.Web.UI.WebControls
                        }\r
                }\r
 \r
-               protected virtual bool IsTrackingViewState\r
+               protected bool IsTrackingViewState\r
                {\r
                        get\r
                        {\r

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DataGridPagerStyle.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DataGridPagerStyle.cs
index 8e15bb77b79bd237748f15ee63a387e91b556f1e..20d1584184c5e97985e076b7cff7d810babf8f41 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/DataGridPagerStyle.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/DataGridPagerStyle.cs
@@ -17,7 +17,7 @@ using System.Web.UI;
 \r
 namespace System.Web.UI.WebControls\r
 {\r
-       public class DataGridPagerStyle : TableItemStyle\r
+       public sealed class DataGridPagerStyle : TableItemStyle\r
        {\r
                DataGrid owner;\r
 \r

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DataList.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DataList.cs
index 1cfda979874398b17c0b75995fb7252525a599aa..4058b8d1b2e32d6d3053cea765e67e8b8ff0b78c 100755 (executable)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/DataList.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/DataList.cs
@@ -742,7 +742,7 @@ namespace System.Web.UI.WebControls
                /// Undocumented\r
                /// </summary>\r
                [MonoTODO]\r
-               protected DataListItem CreateItem(int itemIndex, ListItemType itemType)\r
+               protected virtual DataListItem CreateItem(int itemIndex, ListItemType itemType)\r
                {\r
                        throw new NotImplementedException();\r
                }\r
@@ -766,7 +766,7 @@ namespace System.Web.UI.WebControls
                /// Undocumented\r
                /// </summary>\r
                [MonoTODO]\r
-               protected void InitializeItem(DataListItem item)\r
+               protected virtual void InitializeItem(DataListItem item)\r
                {\r
                        throw new NotImplementedException();\r
                }\r

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DataListItem.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DataListItem.cs
index 9928ccc603ec5dea6fe06beb17162f35f69c31bc..31d27e29485a4db0258232e4aaf5f5e351a06566 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/DataListItem.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/DataListItem.cs
@@ -82,7 +82,7 @@ namespace System.Web.UI.WebControls
                        return false;\r
                }\r
 \r
-               internal void SetItemType(ListItemType itemType)\r
+               protected virtual void SetItemType(ListItemType itemType)\r
                {\r
                        if(Enum.IsDefined(typeof(ListItemType), itemType))\r
                        {\r

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/Image.cs b/mcs/class/System.Web/System.Web.UI.WebControls/Image.cs
index 9ae5d539544c232197ed1146f10836e3987fca4a..f3182ec9ce40b466ff778959c40da35ff344f8c4 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/Image.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/Image.cs
@@ -19,7 +19,6 @@ using System.ComponentModel;
 namespace System.Web.UI.WebControls\r
 {\r
        [DefaultProperty("ImageUrl")]\r
-       [ParseChildrenAttribute(false)]\r
        public class Image : WebControl\r
        {\r
                public Image(): base(HtmlTextWriterTag.Img)\r

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/LinkButton.cs b/mcs/class/System.Web/System.Web.UI.WebControls/LinkButton.cs
index 1706ab46324eb25a0871a9eb554a79fac5d09ddf..b67c02fda92e6f65ffd7784cd7980ffa347177f8 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/LinkButton.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/LinkButton.cs
@@ -104,6 +104,11 @@ namespace System.Web.UI.WebControls
                        }\r
                }\r
 \r
+               protected virtual void OnPreRender (EventArgs e)\r
+               {\r
+                       base.OnPreRender(e);\r
+               }\r
+\r
                void IPostBackEventHandler.RaisePostBackEvent (string eventArgument)\r
                {\r
                        if (CausesValidation)\r

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ListControl.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ListControl.cs
index 9b118b114a8de22cc296d2b99325b52d75aad4ed..7824ef753125c60c81514ba5b4d6f59ba2abf2ba 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/ListControl.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ListControl.cs
@@ -25,7 +25,7 @@ namespace System.Web.UI.WebControls
        //[Designer("??")]\r
        //[DataBindingHandler("??")]\r
        [ParseChildren(true, "Items")]\r
-       public class ListControl: WebControl\r
+       public abstract class ListControl: WebControl\r
        {\r
                private static readonly object SelectedIndexChangedEvent = new object();\r
 \r
@@ -292,6 +292,11 @@ namespace System.Web.UI.WebControls
                                }\r
                }\r
 \r
+               protected virtual void OnPreRender (EventArgs e)\r
+               {\r
+                       base.OnPreRender(e);\r
+               }\r
+\r
                protected override object SaveViewState()\r
                {\r
                        //Order: BaseClass, Items (Collection), Indices\r

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ListItem.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ListItem.cs
index e58a1917835fe8efdb6f7cc3483dc4bc9d251416..79346f161097bfd94a5cf2752233950eccf2b521 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/ListItem.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ListItem.cs
@@ -226,6 +226,20 @@ namespace System.Web.UI.WebControls
                        return null;\r
                }\r
 \r
+               public override bool Equals (object o)\r
+               {\r
+                       ListItem li = o as ListItem;\r
+                       if (li == null)\r
+                               return false;\r
+\r
+                       return (Text == li.Text && Value == li.Value);\r
+               }\r
+\r
+               public override string ToString ()\r
+               {\r
+                       return Text;\r
+               }\r
+\r
                bool IStateManager.IsTrackingViewState\r
                {\r
                        get\r

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ListItemCollection.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ListItemCollection.cs
index c0217828ea85b4df81e4c9d38a8e780c65cb8202..2d65c5f45f18d55b9dce5a5a1aa7510abc1f85c2 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/ListItemCollection.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ListItemCollection.cs
@@ -22,7 +22,7 @@ namespace System.Web.UI.WebControls
 {\r
        //[DefaultMember("Item")] I need the this[...] thing...\r
        //[Editor("??", typeof(Design.WebControls.ListItemCollectionEditor))]\r
-       public class ListItemCollection : IList, ICollection, IEnumerable, IStateManager\r
+       public sealed class ListItemCollection : IList, ICollection, IEnumerable, IStateManager\r
        {\r
                private ArrayList items;\r
                private bool      saveAll;\r

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/Repeater.cs b/mcs/class/System.Web/System.Web.UI.WebControls/Repeater.cs
index 612be547bf985851620cff3f7dd2f7fdd3a38fb7..817437cb53f3467aa3f332cf94b67920039dffb9 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/Repeater.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/Repeater.cs
@@ -362,5 +362,17 @@ namespace System.Web.UI.WebControls
                                }\r
                        }\r
                }\r
+\r
+               [MonoTODO]\r
+               protected virtual RepeaterItem CreateItem (int itemIndex, ListItemType itemType)\r
+               {\r
+                       throw new NotImplementedException ();\r
+               }\r
+\r
+               [MonoTODO]\r
+               protected virtual void InitializeItem (RepeaterItem item)\r
+               {\r
+                       throw new NotImplementedException ();\r
+               }\r
        }\r
 }\r

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ServerValidateEventArgs.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ServerValidateEventArgs.cs
index 69ac40110e86224f52ce033ddd656692456d86a3..1bfd0aabfd06df94fb995a1e644134db3381c59a 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/ServerValidateEventArgs.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ServerValidateEventArgs.cs
@@ -30,18 +30,13 @@ namespace System.Web.UI.WebControls
 \r
                public bool IsValid\r
                {\r
-                       get\r
-                       {\r
-                               return isValid;\r
-                       }\r
+                       get { return isValid; }\r
+                       set { isValid = value; }\r
                }\r
 \r
                public string Value\r
                {\r
-                       get\r
-                       {\r
-                               return value;\r
-                       }\r
+                       get { return value; }\r
                }\r
        }\r
 }\r

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/Style.cs b/mcs/class/System.Web/System.Web.UI.WebControls/Style.cs
index 2dbb48b949e53ea76723cc3079b19f3a6e7cc0b2..c8f130f64021c3a0b16270cec13d430366e07356 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/Style.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/Style.cs
@@ -69,7 +69,7 @@ namespace System.Web.UI.WebControls
                        selectionBits = 0x00;\r
                }\r
 \r
-               internal virtual StateBag ViewState\r
+               StateBag ViewState\r
                {\r
                        get\r
                        {\r
@@ -225,7 +225,7 @@ namespace System.Web.UI.WebControls
                        }\r
                }\r
 \r
-               internal virtual bool IsEmpty\r
+               virtual bool IsEmpty\r
                {\r
                        get { return (selectionBits == 0); }\r
                }\r
@@ -480,7 +480,7 @@ namespace System.Web.UI.WebControls
                        Set(MARKED);\r
                }\r
 \r
-               protected internal object SaveViewState()\r
+               virtual object SaveViewState()\r
                {\r
                        if(viewState != null)\r
                        {\r

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/TableRow.cs b/mcs/class/System.Web/System.Web.UI.WebControls/TableRow.cs
index 3128f242136ee081f559c378b85cf839b1da320b..e1184e4f3f61cac767d3eef4889f169ccf4e0074 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/TableRow.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/TableRow.cs
@@ -66,9 +66,9 @@ namespace System.Web.UI.WebControls
                        return new CellControlCollection (this);\r
                }\r
 \r
-               class CellControlCollection : ControlCollection\r
+               protected class CellControlCollection : ControlCollection\r
                {\r
-                       public CellControlCollection (Control owner) : base (owner)\r
+                       CellControlCollection (Control owner) : base (owner)\r
                        {\r
                        }\r
 \r

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/WebControl.cs b/mcs/class/System.Web/System.Web.UI.WebControls/WebControl.cs
index 8451774a3984f0264d4e1f448488f1816b981257..b31c3686af2a92e600ab708d08e62b22b2561f8d 100755 (executable)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/WebControl.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/WebControl.cs
@@ -182,7 +182,7 @@ namespace System.Web.UI.WebControls
                }\r
 \r
                [MonoTODO("FIXME_Internal_method_calls")]\r
-               public virtual Style ControlStyle\r
+               public Style ControlStyle\r
                {\r
                        get\r
                        {\r

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/Xml.cs b/mcs/class/System.Web/System.Web.UI.WebControls/Xml.cs
index 597f984e5d3b3a528d2c23ee4f7361942bdd0ba2..ba9502eb53f94f7a2bff4ad057672168488aba08 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/Xml.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/Xml.cs
@@ -21,6 +21,7 @@ using System.Web.UI;
 \r
 namespace System.Web.UI.WebControls\r
 {\r
+       [PersistChildren(false)]\r
        public class Xml : Control\r
        {\r
                private XmlDocument      document;\r