Author: krasnov
Date: 2007-07-05 08:39:13 -0400 (Thu, 05 Jul 2007)
New Revision: 81388
Modified:
trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
trunk/mcs/class/System.Web/System.Web.UI.WebControls/WebControl.cs
Log:
* WebControl.cs: fixed AddDisplayStyleAttribute, returns if ControlStyle is not
created
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
2007-07-05 12:18:42 UTC (rev 81387)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
2007-07-05 12:39:13 UTC (rev 81388)
@@ -1,3 +1,8 @@
+2007-07-04 Vladimir Krasnov <[EMAIL PROTECTED]>
+
+ * WebControl.cs: fixed AddDisplayStyleAttribute, returns if
+ ControlStyle is not created
+
2007-07-02 Marek Habersack <[EMAIL PROTECTED]>
* WebControl.cs: Revert r80368, as it wasn't the correct
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/WebControl.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/WebControl.cs
2007-07-05 12:18:42 UTC (rev 81387)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/WebControl.cs
2007-07-05 12:39:13 UTC (rev 81388)
@@ -481,6 +481,9 @@
#if NET_2_0
internal void AddDisplayStyleAttribute (HtmlTextWriter writer)
{
+ if (!ControlStyleCreated)
+ return;
+
if (!ControlStyle.BorderWidth.IsEmpty ||
(ControlStyle.BorderStyle != BorderStyle.None &&
ControlStyle.BorderStyle != BorderStyle.NotSet) ||
!ControlStyle.Height.IsEmpty ||
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
