diff options
| author | Gonzalo Paniagua Javier <gonzalo.mono@gmail.com> | 2002-07-13 06:07:57 +0400 |
|---|---|---|
| committer | Gonzalo Paniagua Javier <gonzalo.mono@gmail.com> | 2002-07-13 06:07:57 +0400 |
| commit | 91930711e86d38ba24e9179cc1e12f7818508088 (patch) | |
| tree | fbc0045bb05ae058c5c84b6e6a717ed67719a16f /mcs/class | |
| parent | 3c336087b4c6caf527192afee9053d1339b1e1ee (diff) | |
2002-07-12 Gonzalo Paniagua Javier <gonzalo@ximian.com>
* list: added some more files from System.Web.Hosting.
* System.Web.UI/ConstructorNeedsTagAttribute.cs: the default
constructor sets the property to false.
* System.Web.UI.HtmlControls/HtmlGenericControl.cs: fixed TagName
signature and get/set.
* System.Web.UI.HtmlControls/HtmlInputImage.cs: added attribute and
fixed signature of ServerClick.
* System.Web.UI.HtmlControls/HtmlInputText.cs: added attribute.
* System.Web.UI.WebControls/AdRotator.cs:
* System.Web.UI.WebControls/Button.cs:
* System.Web.UI.WebControls/Calendar.cs:
* System.Web.UI.WebControls/CheckBox.cs:
* System.Web.UI.WebControls/CheckBoxList.cs:
* System.Web.UI.WebControls/DataList.cs:
* System.Web.UI.WebControls/DropDownList.cs:
* System.Web.UI.WebControls/HyperLink.cs:
* System.Web.UI.WebControls/HyperLinkColumn.cs:
* System.Web.UI.WebControls/Image.cs:
* System.Web.UI.WebControls/ImageButton.cs:
* System.Web.UI.WebControls/Label.cs:
* System.Web.UI.WebControls/LinkButton.cs:
* System.Web.UI.WebControls/ListBox.cs:
* System.Web.UI.WebControls/Panel.cs:
* System.Web.UI.WebControls/PlaceHolder.cs:
* System.Web.UI.WebControls/RadioButton.cs:
* System.Web.UI.WebControls/RadioButtonList.cs:
* System.Web.UI.WebControls/Table.cs:
* System.Web.UI.WebControls/TableRow.cs:
* System.Web.UI.WebControls/TextBox.cs:
* System.Web.UI.WebControls/WebControl.cs: removed attributes
added by mistake (i used GetCustomAttributes (true), d'oh!).
* System.Web.UI.WebControls/DataListItem.cs: implemented RenderItem.
* System.Web.UI.WebControls/Repeater.cs: implemented CreateItem and
InitializeItem.
svn path=/trunk/mcs/; revision=5749
Diffstat (limited to 'mcs/class')
33 files changed, 102 insertions, 72 deletions
diff --git a/mcs/class/System.Web/ChangeLog b/mcs/class/System.Web/ChangeLog index 677d6afa69c..54f1dbf444b 100644 --- a/mcs/class/System.Web/ChangeLog +++ b/mcs/class/System.Web/ChangeLog @@ -1,5 +1,9 @@ 2002-07-12 Gonzalo Paniagua Javier <gonzalo@ximian.com> + * list: added some more files from System.Web.Hosting. + +2002-07-12 Gonzalo Paniagua Javier <gonzalo@ximian.com> + * System.Web.build: removed some more excludes. 2002-07-05 Gonzalo Paniagua Javier <gonzalo@ximian.com> diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/ChangeLog b/mcs/class/System.Web/System.Web.UI.HtmlControls/ChangeLog index 642656457db..d3b874f85b3 100644 --- a/mcs/class/System.Web/System.Web.UI.HtmlControls/ChangeLog +++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/ChangeLog @@ -1,3 +1,9 @@ +2002-07-12 Gonzalo Paniagua Javier <gonzalo@ximian.com> + + * HtmlGenericControl.cs: fixed TagName signature and get/set. + * HtmlInputImage.cs: added attribute and fixed signature of ServerClick. + * HtmlInputText.cs: added attribute. + 2002-07-05 Gonzalo Paniagua Javier <gonzalo@ximian.com> * HtmlForm.cs: don't render action attribute. diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlGenericControl.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlGenericControl.cs index e91265ed61a..91cd26ce9bf 100644 --- a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlGenericControl.cs +++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlGenericControl.cs @@ -1,10 +1,12 @@ // // System.Web.UI.HtmlControls.HtmlGenericControl.cs // -// Author: +// Authors: // Bob Smith <bob@thestuff.net> +// Gonzalo Paniagua (gonzalo@ximian.com) // // (C) Bob Smith +// (c) 2002 Ximian, Inc. (http://www.ximian.com) // using System; @@ -15,20 +17,25 @@ namespace System.Web.UI.HtmlControls{ [ConstructorNeedsTag] public class HtmlGenericControl : HtmlContainerControl { - + private string tagName; + public HtmlGenericControl() : this ("span") { } public HtmlGenericControl (string tag) : - base(tag) + base () { + if (tag == null) + tag = ""; + tagName = tag; } - public override string TagName + public new string TagName { - get { return base.TagName; } + get { return tagName; } + set { tagName = value; } } } } diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputImage.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputImage.cs index b8e5f38face..e0699386f10 100755 --- a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputImage.cs +++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputImage.cs @@ -4,13 +4,15 @@ */
using System;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Globalization;
using System.Web;
using System.Web.UI;
-using System.Globalization;
-using System.Collections.Specialized;
namespace System.Web.UI.HtmlControls{
+ [DefaultEvent("ServerClick")]
public class HtmlInputImage : HtmlInputControl, IPostBackEventHandler, IPostBackDataHandler{
private static readonly object EventServerClick;
@@ -59,7 +61,7 @@ namespace System.Web.UI.HtmlControls{ {
}
- public event EventHandler ServerClick{
+ public event ImageClickEventHandler ServerClick{
add{
Events.AddHandler(EventServerClick, value);
}
diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputText.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputText.cs index bbeeb833051..6e6ce48c125 100755 --- a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputText.cs +++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputText.cs @@ -13,6 +13,7 @@ using System.Web.UI; namespace System.Web.UI.HtmlControls{
[DefaultEvent("ServerChange")]
+ [ValidationProperty("Value")]
public class HtmlInputText : HtmlInputControl, IPostBackDataHandler{
private static readonly object EventServerChange;
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/AdRotator.cs b/mcs/class/System.Web/System.Web.UI.WebControls/AdRotator.cs index 9b940c6ca00..834d5f4cedf 100755 --- a/mcs/class/System.Web/System.Web.UI.WebControls/AdRotator.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/AdRotator.cs @@ -29,8 +29,6 @@ namespace System.Web.UI.WebControls //TODO: [Designer("??")]
[ToolboxData("<{0}:AdRotator runat=\"server\" Height=\"60px\" "
+ "Width=\"468\"></{0}:AdRotator>")]
- [PersistChildren(false)]
- [ParseChildren(true)]
public class AdRotator: WebControl
{
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/Button.cs b/mcs/class/System.Web/System.Web.UI.WebControls/Button.cs index 68b68d73348..067c17569a2 100755 --- a/mcs/class/System.Web/System.Web.UI.WebControls/Button.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/Button.cs @@ -23,8 +23,6 @@ namespace System.Web.UI.WebControls //TODO: [Designer("??")]
//TODO: [DataBindingHandler("??UI.Design.TextDataBindingHandler??")]
[ToolboxData("<{0}:Button runat=\"server\" Text=\"Button\"></{0}:Button>")]
- [PersistChildren(false)]
- [ParseChildren(true)]
public class Button : WebControl, IPostBackEventHandler
{
private static readonly object ClickEvent = new object();
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/Calendar.cs b/mcs/class/System.Web/System.Web.UI.WebControls/Calendar.cs index 244b9146aa6..f9753055ded 100755 --- a/mcs/class/System.Web/System.Web.UI.WebControls/Calendar.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/Calendar.cs @@ -27,8 +27,6 @@ namespace System.Web.UI.WebControls [DefaultProperty("SelectedDate")]
//TODO: [Designer("??")]
//[DataBindingHandler("??")]
- [PersistChildren(false)]
- [ParseChildren(true)]
public class Calendar : WebControl, IPostBackEventHandler
{
//
@@ -714,7 +712,7 @@ namespace System.Web.UI.WebControls protected override void TrackViewState()
{
- TrackViewState();
+ base.TrackViewState();
if(titleStyle!=null)
{
titleStyle.TrackViewState();
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog b/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog index c71c126e646..632bc1dca22 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog +++ b/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog @@ -1,3 +1,33 @@ +2002-07-12 Gonzalo Paniagua Javier <gonzalo@ximian.com> + + * AdRotator.cs: + * Button.cs: + * Calendar.cs: + * CheckBox.cs: + * CheckBoxList.cs: + * DataList.cs: + * DropDownList.cs: + * HyperLink.cs: + * HyperLinkColumn.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: removed attributes added by mistake (i used + GetCustomAttributes (true), d'oh!). + + * DataListItem.cs: implemented RenderItem. + + * Repeater.cs: implemented CreateItem and InitializeItem. + 2002-07-08 Gonzalo Paniagua Javier <gonzalo@ximian.com> * BaseDataList.cs: a couple of fiex and added attributes. diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/CheckBox.cs b/mcs/class/System.Web/System.Web.UI.WebControls/CheckBox.cs index 205fb1fb2bc..70931a89d88 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/CheckBox.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/CheckBox.cs @@ -27,8 +27,6 @@ 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(); diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/CheckBoxList.cs b/mcs/class/System.Web/System.Web.UI.WebControls/CheckBoxList.cs index 6b8b0e21b1a..7c2af02c758 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/CheckBoxList.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/CheckBoxList.cs @@ -20,10 +20,6 @@ using System.Web.UI; namespace System.Web.UI.WebControls
{
- [DefaultEvent("SelectedIndexChanged")]
- [DefaultProperty("DataSource")]
- [ParseChildren(true, "Items")]
- [PersistChildren(false)]
public class CheckBoxList: ListControl, IRepeatInfoUser, INamingContainer, IPostBackDataHandler
{
CheckBox checkBoxRepeater;
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 dd163220072..5d331aef02c 100755 --- a/mcs/class/System.Web/System.Web.UI.WebControls/DataList.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/DataList.cs @@ -21,10 +21,6 @@ namespace System.Web.UI.WebControls {
//TODO: [Designer("??")]
//TODO: [Editor("??")]
- [DefaultEvent("SelectedIndexChanged")]
- [DefaultProperty("DataSource")]
- [ParseChildren(true)]
- [PersistChildren(false)]
public class DataList: BaseDataList, INamingContainer, IRepeatInfoUser
{
public const string CancelCommandName = "Cancel";
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 bdcff612992..8c820047a8a 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/DataListItem.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/DataListItem.cs @@ -2,13 +2,14 @@ * Namespace: System.Web.UI.WebControls
* Class: DataListItem
*
- * Author: Gaurav Vaish
+ * Authors: Gaurav Vaish, Gonzalo Paniagua (gonzalo@ximian.com)
* Maintainer: gvaish@iitk.ac.in
* Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>
* Implementation: yes
- * Status: 95%
+ * Status: 100%
*
* (C) Gaurav Vaish (2002)
+ * (c) 2002 Ximian, Inc. (http://www.ximian.com)
*/
using System;
@@ -60,11 +61,29 @@ namespace System.Web.UI.WebControls }
}
- [MonoTODO]
- public virtual void RenderItem(HtmlTextWriter writer, bool extractRows, bool tableLayout)
+ public virtual void RenderItem (HtmlTextWriter writer, bool extractRows, bool tableLayout)
{
- //TODO: Complete me!
- throw new NotImplementedException();
+ if (extractRows){
+ Table tbl = null;
+ foreach (Control ctrl in Controls){
+ if (ctrl is Table){
+ tbl = (Table) ctrl;
+ break;
+ }
+ }
+
+ if (tbl == null)
+ throw new HttpException ("Template table not found!");
+
+ foreach (TableRow row in tbl.Rows)
+ row.RenderControl (writer);
+ } else {
+ if (tableLayout)
+ RenderContents (writer);
+ else
+ RenderControl (writer);
+ }
+
}
protected override Style CreateControlStyle()
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DropDownList.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DropDownList.cs index b7a40ca3f3b..bcea9465b56 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/DropDownList.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/DropDownList.cs @@ -20,10 +20,6 @@ using System.Web.UI; namespace System.Web.UI.WebControls
{
- [DefaultEvent("SelectedIndexChanged")]
- [DefaultProperty("DataSource")]
- [ParseChildren(true, "Items")]
- [PersistChildren(false)]
[ValidationProperty("SelectedItem")]
public class DropDownList : ListControl, IPostBackDataHandler
{
@@ -98,7 +94,7 @@ namespace System.Web.UI.WebControls Page.VerifyRenderingInServerForm(this);
}
writer.AddAttribute(HtmlTextWriterAttribute.Name, UniqueID);
- AddAttributesToRender(writer);
+ base.AddAttributesToRender(writer);
if(AutoPostBack && Page != null)
{
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/HyperLink.cs b/mcs/class/System.Web/System.Web.UI.WebControls/HyperLink.cs index 83c1c7bc82d..a4df948a41f 100755 --- a/mcs/class/System.Web/System.Web.UI.WebControls/HyperLink.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/HyperLink.cs @@ -23,7 +23,6 @@ namespace System.Web.UI.WebControls [ControlBuilder(typeof(HyperLinkControlBuilder))]
//[DataBindingHandler("??")]
[ParseChildren(false)]
- [PersistChildren(false)]
[ToolboxData("<{0}:HyperLink runat=\"server\">HyperLink</{0}:HyperLink>")]
public class HyperLink: WebControl
{
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/HyperLinkColumn.cs b/mcs/class/System.Web/System.Web.UI.WebControls/HyperLinkColumn.cs index a2eb2465950..9591388a2e7 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/HyperLinkColumn.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/HyperLinkColumn.cs @@ -140,7 +140,7 @@ namespace System.Web.UI.WebControls public override void InitializeCell(TableCell cell, int columnIndex, ListItemType itemType)
{
- InitializeCell(cell, columnIndex, itemType);
+ base.InitializeCell(cell, columnIndex, itemType);
if(Enum.IsDefined(typeof(ListItemType), itemType) && itemType != ListItemType.Footer)
{
HyperLink toDisplay = new HyperLink();
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 400fb572b0d..f3182ec9ce4 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/Image.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/Image.cs @@ -19,8 +19,6 @@ using System.ComponentModel; namespace System.Web.UI.WebControls
{
[DefaultProperty("ImageUrl")]
- [ParseChildren(true)]
- [PersistChildren(false)]
public class Image : WebControl
{
public Image(): base(HtmlTextWriterTag.Img)
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ImageButton.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ImageButton.cs index b46bae5cec0..c318dd3c002 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/ImageButton.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/ImageButton.cs @@ -21,9 +21,6 @@ using System.ComponentModel; namespace System.Web.UI.WebControls
{
[DefaultEvent("Click")]
- [DefaultProperty("ImageUrl")]
- [ParseChildren(true)]
- [PersistChildren(false)]
public class ImageButton: Image, IPostBackDataHandler, IPostBackEventHandler
{
private static readonly object ClickEvent = new object();
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/Label.cs b/mcs/class/System.Web/System.Web.UI.WebControls/Label.cs index 7874cb940b8..f28f6e46db3 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/Label.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/Label.cs @@ -24,7 +24,6 @@ namespace System.Web.UI.WebControls //[ControlBuilder(typeof(LabelControlBuilder))]
//[DataBindingHandler("??")]
[ParseChildren(false)]
- [PersistChildren(false)]
[ToolboxData("<{0}:Label runat=\"server\">Label</{0}:Label>")]
public class Label : WebControl
{
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 42927781aeb..89d6dea68d9 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/LinkButton.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/LinkButton.cs @@ -24,7 +24,6 @@ namespace System.Web.UI.WebControls [ControlBuilder(typeof(LinkButtonControlBuilder))]
//[DataBindingHandler("??")]
[ParseChildren(false)]
- [PersistChildren(false)]
[ToolboxData("<{0}:LinkButton runat=\"server\">LinkButton</{0}:LinkButton>")]
public class LinkButton : WebControl, IPostBackEventHandler
{
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ListBox.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ListBox.cs index cd5c1b9cfde..5548f0da083 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/ListBox.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/ListBox.cs @@ -22,10 +22,6 @@ using System.Web.UI; namespace System.Web.UI.WebControls
{
- [DefaultEvent("SelectedIndexChanged")]
- [DefaultProperty("DataSource")]
- [ParseChildren(true)]
- [PersistChildren(false)]
[ValidationProperty("SelectedItem")]
public class ListBox : ListControl, IPostBackDataHandler
{
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/Panel.cs b/mcs/class/System.Web/System.Web.UI.WebControls/Panel.cs index b00eca0efe5..82c7ea11d37 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/Panel.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/Panel.cs @@ -19,7 +19,6 @@ using System.Web.UI; namespace System.Web.UI.WebControls
{
//[Designer("??")]
- [DefaultProperty("ID")]
[ParseChildren(false)]
[PersistChildren(true)]
[ToolboxData("<{0}:Panel runat=\"server\">Panel</{0}:Panel>")]
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/PlaceHolder.cs b/mcs/class/System.Web/System.Web.UI.WebControls/PlaceHolder.cs index c2956f83432..19cc57bfd2e 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/PlaceHolder.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/PlaceHolder.cs @@ -19,7 +19,6 @@ using System.Web.UI; namespace System.Web.UI.WebControls
{
[ControlBuilder(typeof(PlaceHolderControlBuilder))]
- [DefaultProperty("ID")]
public class PlaceHolder : Control
{
public PlaceHolder(): base()
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/RadioButton.cs b/mcs/class/System.Web/System.Web.UI.WebControls/RadioButton.cs index af0425feaec..c999695a8aa 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/RadioButton.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/RadioButton.cs @@ -22,10 +22,6 @@ using System.ComponentModel; namespace System.Web.UI.WebControls
{
//[Designer("??")]
- [DefaultEvent("CheckedChanged")]
- [DefaultProperty("Text")]
- [ParseChildren(true)]
- [PersistChildren(false)]
public class RadioButton : CheckBox, IPostBackDataHandler
{
public RadioButton () : base ()
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/RadioButtonList.cs b/mcs/class/System.Web/System.Web.UI.WebControls/RadioButtonList.cs index 4900457f5d9..c1f0ece4094 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/RadioButtonList.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/RadioButtonList.cs @@ -20,10 +20,6 @@ using System.Web.UI; namespace System.Web.UI.WebControls
{
- [DefaultEvent("SelectedIndexChanged")]
- [DefaultProperty("DataSource")]
- [ParseChildren(true, "Items")]
- [PersistChildren(false)]
[ValidationProperty("SelectedItem")]
public class RadioButtonList : ListControl, IRepeatInfoUser, INamingContainer, IPostBackDataHandler
{
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 817437cb53f..2137daff18c 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/Repeater.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/Repeater.cs @@ -2,13 +2,14 @@ * Namespace: System.Web.UI.WebControls
* Class: Repeater
*
- * Author: Gaurav Vaish
+ * Author: Gaurav Vaish, Gonzalo Paniagua (gonzalo@ximian.com)
* Maintainer: gvaish@iitk.ac.in
* Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>
* Implementation: yes
- * Status: 90%
+ * Status: 100%
*
* (C) Gaurav Vaish (2002)
+ * (c) 2002 Ximian, Inc. (http://www.ximian.com)
*/
using System;
@@ -363,16 +364,14 @@ namespace System.Web.UI.WebControls }
}
- [MonoTODO]
protected virtual RepeaterItem CreateItem (int itemIndex, ListItemType itemType)
{
- throw new NotImplementedException ();
+ return new RepeaterItem (itemIndex, itemType);
}
- [MonoTODO]
protected virtual void InitializeItem (RepeaterItem item)
{
- throw new NotImplementedException ();
+ InstantiateItem (item);
}
}
}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/Table.cs b/mcs/class/System.Web/System.Web.UI.WebControls/Table.cs index 406eae7e420..16d1cf25f18 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/Table.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/Table.cs @@ -23,7 +23,6 @@ namespace System.Web.UI.WebControls [DefaultProperty("Rows")]
//[Designer("??")]
[ParseChildren(true, "Rows")]
- [PersistChildren(false)]
public class Table: WebControl
{
private TableRowCollection rows;
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 ea92921eb23..a0a1d82c922 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/TableRow.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/TableRow.cs @@ -20,7 +20,6 @@ namespace System.Web.UI.WebControls {
[DefaultProperty("Cells")]
[ParseChildren(true, "Cells")]
- [PersistChildren(false)]
public class TableRow: WebControl
{
private TableCellCollection cells;
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/TextBox.cs b/mcs/class/System.Web/System.Web.UI.WebControls/TextBox.cs index eb8bd4ba39e..d4c5f8607fc 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/TextBox.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/TextBox.cs @@ -23,7 +23,6 @@ namespace System.Web.UI.WebControls [DefaultEvent("TextChanged")]
[DefaultProperty("Text")]
[ParseChildren(false)]
- [PersistChildren(false)]
[ValidationProperty("Text")]
public class TextBox : WebControl, IPostBackDataHandler
{
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 bc18d884e24..171ab528741 100755 --- a/mcs/class/System.Web/System.Web.UI.WebControls/WebControl.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/WebControl.cs @@ -23,7 +23,6 @@ namespace System.Web.UI.WebControls {
[PersistChildrenAttribute(false)]
[ParseChildrenAttribute(true)]
- [DefaultProperty("ID")]
public class WebControl : Control, IAttributeAccessor
{
//TODO: A list of private members may be incomplete
@@ -476,7 +475,7 @@ namespace System.Web.UI.WebControls string IAttributeAccessor.GetAttribute(string key)
{
if(Attributes!=null)
- return (string)Attributes[key];
+ return Attributes[key] as string;
return null;
}
diff --git a/mcs/class/System.Web/System.Web.UI/ChangeLog b/mcs/class/System.Web/System.Web.UI/ChangeLog index 8184cc695db..621c88a8d12 100644 --- a/mcs/class/System.Web/System.Web.UI/ChangeLog +++ b/mcs/class/System.Web/System.Web.UI/ChangeLog @@ -1,5 +1,10 @@ 2002-07-12 Gonzalo Paniagua Javier <gonzalo@ximian.com> + * ConstructorNeedsTagAttribute.cs: the default constructor sets the + property to false. + +2002-07-12 Gonzalo Paniagua Javier <gonzalo@ximian.com> + * System.Web.UI/AttributeCollection.cs: added CssStyleCollection. * System.Web.UI/CssStyleCollection.cs: use a StateBag instead of a diff --git a/mcs/class/System.Web/System.Web.UI/ConstructorNeedsTagAttribute.cs b/mcs/class/System.Web/System.Web.UI/ConstructorNeedsTagAttribute.cs index f52a4c6e0b0..cacfe8da90a 100755 --- a/mcs/class/System.Web/System.Web.UI/ConstructorNeedsTagAttribute.cs +++ b/mcs/class/System.Web/System.Web.UI/ConstructorNeedsTagAttribute.cs @@ -14,10 +14,9 @@ namespace System.Web.UI { { bool needsTag; - // LAMESPEC: we will default to true for now. public ConstructorNeedsTagAttribute () { - needsTag = true; + needsTag = false; } public ConstructorNeedsTagAttribute (bool needsTag) diff --git a/mcs/class/System.Web/list b/mcs/class/System.Web/list index 793d0c4aad7..843e384466b 100755 --- a/mcs/class/System.Web/list +++ b/mcs/class/System.Web/list @@ -54,7 +54,11 @@ System.Web.Configuration/ClientTargetSectionHandler.cs System.Web.Configuration/FormsAuthPasswordFormat.cs System.Web.Configuration/FormsProtectionEnum.cs System.Web.Configuration/HttpCapabilitiesBase.cs +System.Web.Hosting/AppDomainFactory.cs System.Web.Hosting/ApplicationHost.cs +System.Web.Hosting/IAppDomainFactory.cs +System.Web.Hosting/IISAPIRuntime.cs +System.Web.Hosting/ISAPIRuntime.cs System.Web.Hosting/SimpleWorkerRequest.cs System.Web.Mail/MailAttachment.cs System.Web.Mail/MailEncoding.cs |