Author: igorz
Date: 2008-02-20 08:28:37 -0500 (Wed, 20 Feb 2008)
New Revision: 96247
Modified:
trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
trunk/mcs/class/System.Web/System.Web.UI.WebControls/Login.cs
Log:
merge r96245:96256:
2008-02-20 Igor Zelmanovich <[EMAIL PROTECTED]>
* Login.cs: render id attribute of root element correctly.
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
2008-02-20 13:23:02 UTC (rev 96246)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
2008-02-20 13:28:37 UTC (rev 96247)
@@ -1,3 +1,7 @@
+2008-02-20 Igor Zelmanovich <[EMAIL PROTECTED]>
+
+ * Login.cs: render id attribute of root element correctly.
+
2008-02-18 Marek Habersack <[EMAIL PROTECTED]>
* FormView.cs: the ItemCreated must be fired before data is bound
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/Login.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/Login.cs
2008-02-20 13:23:02 UTC (rev 96246)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/Login.cs
2008-02-20 13:28:37 UTC (rev 96247)
@@ -57,9 +57,17 @@
{
_owner = owner;
InitTable ();
- ID = _owner.ID;
}
-
+
+ public override string ID {
+ get {
+ return _owner.ID;
+ }
+ set {
+ _owner.ID = value;
+ }
+ }
+
public override string ClientID {
get {
return _owner.ClientID;
@@ -73,9 +81,6 @@
private void InitTable ()
{
- CellSpacing = 0;
- CellPadding = _owner.BorderPadding;
-
_containerCell = new TableCell ();
TableRow row = new TableRow ();
@@ -83,10 +88,12 @@
Rows.Add (row);
}
- protected internal override void OnPreRender (EventArgs
e)
- {
+ protected internal override void Render (HtmlTextWriter
writer) {
+ CellSpacing = 0;
+ CellPadding = _owner.BorderPadding;
ApplyStyle (_owner.ControlStyle);
- base.OnPreRender (e);
+ Attributes.CopyFrom (_owner.Attributes);
+ base.Render (writer);
}
public Control UserNameTextBox {
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
