2002-07-07 Gonzalo Paniagua Javier <gonzalo@ximian.com>
authorGonzalo Paniagua Javier <gonzalo.mono@gmail.com>
Sun, 7 Jul 2002 23:46:38 +0000 (23:46 -0000)
committerGonzalo Paniagua Javier <gonzalo.mono@gmail.com>
Sun, 7 Jul 2002 23:46:38 +0000 (23:46 -0000)
* AdRotator.cs:
* BaseValidator.cs:
* Button.cs:
* Calendar.cs:
* CheckBox.cs:
* CheckBoxList.cs:
* DataGrid.cs:
* DataList.cs:
* DropDownList.cs:
* HyperLink.cs:
* Image.cs:
* ImageButton.cs:
* Label.cs:
* LinkButton.cs:
* ListBox.cs:
* Panel.cs:
* PlaceHolder.cs:
* RadioButton.cs:
* RadioButtonList.cs:
* Table.cs:
* TableRow.cs:
* TextBox.cs:
* WebControl.cs:
* Xml.cs: added/fixed all attributes used by xsp.

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

25 files changed:
mcs/class/System.Web/System.Web.UI.WebControls/AdRotator.cs
mcs/class/System.Web/System.Web.UI.WebControls/BaseValidator.cs
mcs/class/System.Web/System.Web.UI.WebControls/Button.cs
mcs/class/System.Web/System.Web.UI.WebControls/Calendar.cs
mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
mcs/class/System.Web/System.Web.UI.WebControls/CheckBox.cs
mcs/class/System.Web/System.Web.UI.WebControls/CheckBoxList.cs
mcs/class/System.Web/System.Web.UI.WebControls/DataGrid.cs
mcs/class/System.Web/System.Web.UI.WebControls/DataList.cs
mcs/class/System.Web/System.Web.UI.WebControls/DropDownList.cs
mcs/class/System.Web/System.Web.UI.WebControls/HyperLink.cs
mcs/class/System.Web/System.Web.UI.WebControls/Image.cs
mcs/class/System.Web/System.Web.UI.WebControls/ImageButton.cs
mcs/class/System.Web/System.Web.UI.WebControls/Label.cs
mcs/class/System.Web/System.Web.UI.WebControls/LinkButton.cs
mcs/class/System.Web/System.Web.UI.WebControls/ListBox.cs
mcs/class/System.Web/System.Web.UI.WebControls/Panel.cs
mcs/class/System.Web/System.Web.UI.WebControls/PlaceHolder.cs
mcs/class/System.Web/System.Web.UI.WebControls/RadioButton.cs
mcs/class/System.Web/System.Web.UI.WebControls/RadioButtonList.cs
mcs/class/System.Web/System.Web.UI.WebControls/Table.cs
mcs/class/System.Web/System.Web.UI.WebControls/TableRow.cs
mcs/class/System.Web/System.Web.UI.WebControls/TextBox.cs
mcs/class/System.Web/System.Web.UI.WebControls/WebControl.cs
mcs/class/System.Web/System.Web.UI.WebControls/Xml.cs

index 834d5f4cedf5bc1ae6f9a7796041a40458ba583d..9b940c6ca00fe893e7793615ee230bb1e740e042 100755 (executable)
@@ -29,6 +29,8 @@ namespace System.Web.UI.WebControls
        //TODO: [Designer("??")]\r
        [ToolboxData("<{0}:AdRotator runat=\"server\" Height=\"60px\" "\r
                     + "Width=\"468\"></{0}:AdRotator>")]\r
+       [PersistChildren(false)]\r
+       [ParseChildren(true)]\r
        public class AdRotator: WebControl\r
        {\r
 \r
index a7d9d6a9beed30ff0f850d14881925ce95407b08..df69dc417f1fe2f4589c20436087e8057915217c 100755 (executable)
@@ -94,11 +94,11 @@ namespace System.Web.UI.WebControls
                {\r
                        get\r
                        {\r
-                               return Enabled;\r
+                               return base.Enabled;\r
                        }\r
                        set\r
                        {\r
-                               Enabled = value;\r
+                               base.Enabled = value;\r
                        }\r
                }\r
 \r
@@ -123,11 +123,11 @@ namespace System.Web.UI.WebControls
                {\r
                        get\r
                        {\r
-                               return ForeColor;\r
+                               return base.ForeColor;\r
                        }\r
                        set\r
                        {\r
-                               ForeColor = value;\r
+                               base.ForeColor = value;\r
                        }\r
                }\r
 \r
@@ -135,6 +135,9 @@ namespace System.Web.UI.WebControls
                {\r
                        get\r
                        {\r
+                               if (Enabled == false)\r
+                                       return true;\r
+\r
                                object o = ViewState["IsValid"];\r
                                if(o != null)\r
                                {\r
@@ -150,11 +153,11 @@ namespace System.Web.UI.WebControls
 \r
                public static PropertyDescriptor GetValidationProperty(object component)\r
                {\r
-                       ValidationPropertyAttribute attrib = (ValidationPropertyAttribute)((TypeDescriptor.GetAttributes(component))[typeof(ValidationPropertyAttribute)]);\r
-                       if(attrib != null && attrib.Name != null)\r
-                       {\r
-                               return (TypeDescriptor.GetProperties(component, null))[attrib.Name];\r
-                       }\r
+                       AttributeCollection coll = TypeDescriptor.GetAttributes (component);\r
+                       Type type = typeof (ValidationPropertyAttribute);\r
+                       ValidationPropertyAttribute attrib = (ValidationPropertyAttribute) coll [type];\r
+                       if (attrib != null && attrib.Name != null)\r
+                               return (TypeDescriptor.GetProperties (component)) [attrib.Name];\r
                        return null;\r
                }\r
 \r
@@ -211,7 +214,7 @@ namespace System.Web.UI.WebControls
                        {\r
                                Enabled = true;\r
                        }\r
-                       AddAttributesToRender(writer);\r
+                       base.AddAttributesToRender(writer);\r
                        if(RenderUplevel)\r
                        {\r
                                if(ID == null)\r
@@ -283,9 +286,11 @@ namespace System.Web.UI.WebControls
                        }\r
                        if(EnableClientScript)\r
                        {\r
-                               throw new NotImplementedException();\r
-                               //TODO: I need to get the (Browser->Dom_version_major >= 4 &&\r
-                               //                         Brower->Ecma_script_version >= 1.2)\r
+                               // By now, return true\r
+                               return true;\r
+                               ////throw new NotImplementedException();\r
+                               ////TODO: I need to get the (Browser->Dom_version_major >= 4 &&\r
+                               ////                         Brower->Ecma_script_version >= 1.2)\r
                        }\r
                        return false;\r
                }\r
@@ -321,13 +326,13 @@ namespace System.Web.UI.WebControls
 \r
                protected override void OnInit(EventArgs e)\r
                {\r
-                       OnInit(e);\r
+                       base.OnInit(e);\r
                        Page.Validators.Add(this);\r
                }\r
 \r
                protected override void OnPreRender(EventArgs e)\r
                {\r
-                       OnPreRender(e);\r
+                       base.OnPreRender(e);\r
                        isPreRenderCalled   = true;\r
                        isPropertiesChecked = false;\r
                        renderUplevel       = DetermineRenderUplevel();\r
@@ -343,13 +348,14 @@ namespace System.Web.UI.WebControls
                        {\r
                                Page.Validators.Remove(this);\r
                        }\r
-                       OnUnload(e);\r
+                       base.OnUnload(e);\r
                }\r
 \r
                [MonoTODO("What_do_I_have_to_do")]\r
                protected void RegisterValidatorCommonScript()\r
                {\r
-                       throw new NotImplementedException();\r
+                       // Keep going\r
+                       //throw new NotImplementedException();\r
                }\r
 \r
                [MonoTODO("I_have_to_know_javascript_for_this_I_know_it_but_for_ALL_browsers_NO")]\r
index 067c17569a2bcfad00741eff424407b9959e7de4..68b68d733484bf503a64ccbe937e8f946dda90c3 100755 (executable)
@@ -23,6 +23,8 @@ namespace System.Web.UI.WebControls
        //TODO: [Designer("??")]\r
        //TODO: [DataBindingHandler("??UI.Design.TextDataBindingHandler??")]\r
        [ToolboxData("<{0}:Button runat=\"server\" Text=\"Button\"></{0}:Button>")]\r
+       [PersistChildren(false)]\r
+       [ParseChildren(true)]\r
        public class Button : WebControl, IPostBackEventHandler\r
        {\r
                private static readonly object ClickEvent   = new object();\r
index ea553cc19b8e9a9a7d62b7aa43436e1fba1c57d5..244b9146aa6fb121e5d2841a053a75bdc50502e8 100755 (executable)
@@ -27,6 +27,8 @@ namespace System.Web.UI.WebControls
        [DefaultProperty("SelectedDate")]\r
        //TODO: [Designer("??")]\r
        //[DataBindingHandler("??")]\r
+       [PersistChildren(false)]\r
+       [ParseChildren(true)]\r
        public class Calendar : WebControl, IPostBackEventHandler\r
        {\r
                //\r
index e4f5a25ce60010512ecb5cce3f73046e9287d811..b298ea290001fc15ef13eba0a47c530548c71409 100644 (file)
@@ -1,3 +1,30 @@
+2002-07-07  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+       * AdRotator.cs:
+       * BaseValidator.cs:
+       * Button.cs:
+       * Calendar.cs:
+       * CheckBox.cs:
+       * CheckBoxList.cs:
+       * DataGrid.cs:
+       * DataList.cs:
+       * DropDownList.cs:
+       * HyperLink.cs:
+       * Image.cs:
+       * ImageButton.cs:
+       * Label.cs:
+       * LinkButton.cs:
+       * ListBox.cs:
+       * Panel.cs:
+       * PlaceHolder.cs:
+       * RadioButton.cs:
+       * RadioButtonList.cs:
+       * Table.cs:
+       * TableRow.cs:
+       * TextBox.cs:
+       * WebControl.cs:
+       * Xml.cs: added/fixed all attributes used by xsp.
+
 2002-07-06  Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
        * Table.cs:
index 70931a89d88f643b434693a900f2bdd6fd2d1e37..205fb1fb2bc297c94bfdb88d82ce616fc50345ff 100644 (file)
@@ -27,6 +27,8 @@ namespace System.Web.UI.WebControls
        [DefaultProperty("Text")]
        //[DataBindingHanlder("??")]
        //[Designer("??")]
+       [PersistChildren(false)]
+       [ParseChildren(true)]
        public class CheckBox : WebControl, IPostBackDataHandler
        {
                private static readonly object CheckedChangedEvent = new object();
index 58754a0af781dce0e216e297029358a2b3376f4f..3bb8d79e5b4b9850d4ea12bcb28810fe67f11c73 100644 (file)
@@ -19,6 +19,10 @@ using System.Web.UI;
 \r
 namespace System.Web.UI.WebControls\r
 {\r
+       [DefaultEvent("SelectedIndexChanged"]\r
+       [DefaultProperty("DataSource")]\r
+       [ParseChildren(true, "Items")]\r
+       [PersistChildren(false)]\r
        public class CheckBoxList: ListControl, IRepeatInfoUser, INamingContainer, IPostBackDataHandler\r
        {\r
                CheckBox checkBoxRepeater;\r
index c9da59e129ac81d03a85665d79cba327731e00a1..4fd7e9705a4afb3caaec3ca97b9e686817edfc7a 100644 (file)
@@ -21,6 +21,10 @@ namespace System.Web.UI.WebControls
 {\r
        //TODO: [Designer("??")]\r
        //TODO: [Editor("??")]\r
+       [DefaultEvent("SelectedIndexChanged"]\r
+       [DefaultProperty("DataSource")]\r
+       [ParseChildren(true)]\r
+       [PersistChildren(false)]\r
        public class DataGrid : BaseDataList, INamingContainer\r
        {\r
                public const string CancelCommandName       = "Cancel";\r
index 4058b8d1b2e32d6d3053cea765e67e8b8ff0b78c..945b50e54b8fcf3334ca8771ba86e98ad4a1ae18 100755 (executable)
@@ -20,6 +20,10 @@ namespace System.Web.UI.WebControls
 {\r
        //TODO: [Designer("??")]\r
        //TODO: [Editor("??")]\r
+       [DefaultEvent("SelectedIndexChanged"]\r
+       [DefaultProperty("DataSource")]\r
+       [ParseChildren(true)]\r
+       [PersistChildren(false)]\r
        public class DataList: BaseDataList, INamingContainer, IRepeatInfoUser\r
        {\r
                public const string CancelCommandName = "Cancel";\r
index a128c33cdeb9b60e5985495505d6c26fd47c817d..9b7291ef08bb86a7f881e4e64359ec1248bb61f9 100644 (file)
@@ -19,6 +19,10 @@ using System.Web.UI;
 \r
 namespace System.Web.UI.WebControls\r
 {\r
+       [DefaultEvent("SelectedIndexChanged"]\r
+       [DefaultProperty("DataSource")]\r
+       [ParseChildren(true, "Items")]\r
+       [PersistChildren(false)]\r
        [ValidationProperty("SelectedItem")]\r
        public class DropDownList : ListControl, IPostBackDataHandler\r
        {\r
index a4df948a41f6a08e641adeae4591a7f282f265ea..83c1c7bc82d5bc32824f742ee44ff6dd0f14d370 100755 (executable)
@@ -23,6 +23,7 @@ namespace System.Web.UI.WebControls
        [ControlBuilder(typeof(HyperLinkControlBuilder))]\r
        //[DataBindingHandler("??")]\r
        [ParseChildren(false)]\r
+       [PersistChildren(false)]\r
        [ToolboxData("<{0}:HyperLink runat=\"server\">HyperLink</{0}:HyperLink>")]\r
        public class HyperLink: WebControl\r
        {\r
index f3182ec9ce40b466ff778959c40da35ff344f8c4..400fb572b0d4c089ccc1a755c591cec6085374bd 100644 (file)
@@ -19,6 +19,8 @@ using System.ComponentModel;
 namespace System.Web.UI.WebControls\r
 {\r
        [DefaultProperty("ImageUrl")]\r
+       [ParseChildren(true)]\r
+       [PersistChildren(false)]\r
        public class Image : WebControl\r
        {\r
                public Image(): base(HtmlTextWriterTag.Img)\r
index c318dd3c002b68682df4340588a3bc44c6bd3aea..b46bae5cec0e6afdf870d9754491c75b859f254f 100644 (file)
@@ -21,6 +21,9 @@ using System.ComponentModel;
 namespace System.Web.UI.WebControls\r
 {\r
        [DefaultEvent("Click")]\r
+       [DefaultProperty("ImageUrl")]\r
+       [ParseChildren(true)]\r
+       [PersistChildren(false)]\r
        public class ImageButton: Image, IPostBackDataHandler, IPostBackEventHandler\r
        {\r
                private static readonly object ClickEvent   = new object();\r
index 46d64521f47fa9a482a300cc8c28a760960c2821..7874cb940b8ccad32d3a19924965f5b4767b82ad 100644 (file)
@@ -20,9 +20,11 @@ namespace System.Web.UI.WebControls
 {\r
        [DefaultProperty("Text")]\r
        //[Designer("??")]\r
-       [ControlBuilder(typeof(LabelControlBuilder))]\r
+       //Currently mono does not handle Type in attributes\r
+       //[ControlBuilder(typeof(LabelControlBuilder))] \r
        //[DataBindingHandler("??")]\r
        [ParseChildren(false)]\r
+       [PersistChildren(false)]\r
        [ToolboxData("<{0}:Label runat=\"server\">Label</{0}:Label>")]\r
        public class Label : WebControl\r
        {\r
index 89d6dea68d98954ea3a57ff23654a846a30b23df..42927781aeb782f306a921726fc2b7ae0afe3904 100644 (file)
@@ -24,6 +24,7 @@ namespace System.Web.UI.WebControls
        [ControlBuilder(typeof(LinkButtonControlBuilder))]\r
        //[DataBindingHandler("??")]\r
        [ParseChildren(false)]\r
+       [PersistChildren(false)]\r
        [ToolboxData("<{0}:LinkButton runat=\"server\">LinkButton</{0}:LinkButton>")]\r
        public class LinkButton : WebControl, IPostBackEventHandler\r
        {\r
index 353fb82122445a8d3cb72831fcf0fa7ead7758cf..2ad4ff4038966735a9c783ef73aee59c27e731c5 100644 (file)
@@ -21,6 +21,10 @@ using System.Web.UI;
 \r
 namespace System.Web.UI.WebControls\r
 {\r
+       [DefaultEvent("SelectedIndexChanged"]\r
+       [DefaultProperty("DataSource")]\r
+       [ParseChildren(true)]\r
+       [PersistChildren(false)]\r
        [ValidationProperty("SelectedItem")]\r
        public class ListBox : ListControl, IPostBackDataHandler\r
        {\r
index 82c7ea11d37ebc2212b99d95b14aa6628dd164d3..b00eca0efe5ebb467b33cb8405bb088e32f67b9b 100644 (file)
@@ -19,6 +19,7 @@ using System.Web.UI;
 namespace System.Web.UI.WebControls\r
 {\r
        //[Designer("??")]\r
+       [DefaultProperty("ID")]\r
        [ParseChildren(false)]\r
        [PersistChildren(true)]\r
        [ToolboxData("<{0}:Panel runat=\"server\">Panel</{0}:Panel>")]\r
index fd00a47da9df1302b1a90b64cf6978132bec0b3c..0e2c35a66ba74049699e2a32462c2a9491800d1e 100644 (file)
@@ -18,6 +18,7 @@ using System.Web.UI;
 namespace System.Web.UI.WebControls\r
 {\r
        [ControlBuilder(typeof(PlaceHolderControlBuilder))]\r
+       [DefaultProperty("ID")]\r
        public class PlaceHolder : Control\r
        {\r
                public PlaceHolder(): base()\r
index c999695a8aa0afd93afa00cb44fca7f586277577..59bff120ac5e8873e906cd231216dac2c4130d26 100644 (file)
@@ -22,6 +22,10 @@ using System.ComponentModel;
 namespace System.Web.UI.WebControls\r
 {\r
        //[Designer("??")]\r
+       [DefaultEvent("CheckedChanged"]\r
+       [DefaultProperty("Text")]\r
+       [ParseChildren(true)]\r
+       [PersistChildren(false)]\r
        public class RadioButton : CheckBox, IPostBackDataHandler\r
        {\r
                public RadioButton () : base ()\r
index 0bc441cc5e30f27e4c33778f54f5b79b52c08c77..cfe642c24d77e4cc5afc02bfb190b78d2438ac5f 100644 (file)
@@ -19,6 +19,10 @@ using System.Web.UI;
 \r
 namespace System.Web.UI.WebControls\r
 {\r
+       [DefaultEvent("SelectedIndexChanged"]\r
+       [DefaultProperty("DataSource")]\r
+       [ParseChildren(true, "Items")]\r
+       [PersistChildren(false)]\r
        [ValidationProperty("SelectedItem")]\r
        public class RadioButtonList : ListControl, IRepeatInfoUser, INamingContainer, IPostBackDataHandler\r
        {\r
index 16d1cf25f186ff24bc1083da26fd4cf1c96d8545..406eae7e420a1ba098a3c8a905c291ce7e2e388f 100644 (file)
@@ -23,6 +23,7 @@ namespace System.Web.UI.WebControls
        [DefaultProperty("Rows")]\r
        //[Designer("??")]\r
        [ParseChildren(true, "Rows")]\r
+       [PersistChildren(false)]\r
        public class Table: WebControl\r
        {\r
                private TableRowCollection rows;\r
index a8d05f757e9d1e8398265725f4bc296d791b4f70..4e94539dd9ea6b0dde3c646d374b6d549ae2526c 100644 (file)
@@ -17,7 +17,9 @@ using System.Web.UI;
 \r
 namespace System.Web.UI.WebControls\r
 {\r
-       [ParseChildren(false)]\r
+       [DefaultProperty("Cells")]\r
+       [ParseChildren(true, "Cells")]\r
+       [PersistChildren(false)]\r
        public class TableRow: WebControl\r
        {\r
                private TableCellCollection cells;\r
index 7b2f2e00a59bc9486cb6081d09756e2be0d41a6a..eb8bd4ba39e33812da72bbaeaacb24101dc21197 100644 (file)
 \r
 using System;\r
 using System.Collections.Specialized;\r
+using System.ComponentModel;\r
 using System.Globalization;\r
 using System.Web;\r
 using System.Web.UI;\r
 \r
 namespace System.Web.UI.WebControls\r
 {\r
+       [DefaultEvent("TextChanged")]\r
+       [DefaultProperty("Text")]\r
+       [ParseChildren(false)]\r
+       [PersistChildren(false)]\r
+       [ValidationProperty("Text")]\r
        public class TextBox : WebControl, IPostBackDataHandler\r
        {\r
                private static readonly object TextChangedEvent = new object ();\r
index b31c3686af2a92e600ab708d08e62b22b2561f8d..d108c85d562247b00d6f8b4de16f6f939228cfa8 100755 (executable)
@@ -22,6 +22,7 @@ namespace System.Web.UI.WebControls
 {\r
        [PersistChildrenAttribute(false)]\r
        [ParseChildrenAttribute(true)]\r
+       [DefaultProperty("ID")]\r
        public class WebControl : Control, IAttributeAccessor\r
        {\r
                //TODO: A list of private members may be incomplete\r
index ba9502eb53f94f7a2bff4ad057672168488aba08..e3dc8d4a23d449fe9c3bc02415c8221cff6da2ed 100644 (file)
@@ -21,6 +21,7 @@ using System.Web.UI;
 \r
 namespace System.Web.UI.WebControls\r
 {\r
+       [DefaultProperty("DocumentSource")]\r
        [PersistChildren(false)]\r
        public class Xml : Control\r
        {\r