Author: krasnov
Date: 2006-02-20 10:01:46 -0500 (Mon, 20 Feb 2006)
New Revision: 57070

Modified:
   trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
   trunk/mcs/class/System.Web/System.Web.UI.WebControls/CheckBox.cs
Log:
CheckBox.cs: fixed Render function, removed rendering of empty  <span> element 
if ControlStyleCreated but it's empty.
fixed "disabled" attribute, it should be placed into span element

Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog      
2006-02-20 15:00:34 UTC (rev 57069)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog      
2006-02-20 15:01:46 UTC (rev 57070)
@@ -1,5 +1,11 @@
 2006-02-20  Vladimir Krasnov  <[EMAIL PROTECTED]>
 
+       * CheckBox.cs: fixed Render function, removed rendering of empty 
+       <span> element if ControlStyleCreated but it's empty.
+       fixed "disabled" attribute, it should be placed into span element
+
+2006-02-20  Vladimir Krasnov  <[EMAIL PROTECTED]>
+
        * BoundColumn.cs: fixed InitializeCell function, if DataField is 
        null or empty string, the cell should not be bound.
 

Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/CheckBox.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/CheckBox.cs    
2006-02-20 15:00:34 UTC (rev 57069)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/CheckBox.cs    
2006-02-20 15:01:46 UTC (rev 57070)
@@ -320,13 +320,13 @@
                        if (Page != null)
                                Page.VerifyRenderingInServerForm (this);
 
-                       bool need_span = ControlStyleCreated;
+                       bool need_span = ControlStyleCreated && 
!ControlStyle.IsEmpty;
                        if (need_span)
                                ControlStyle.AddAttributesToRender (w, this);
 
                        if (!Enabled) {
                                w.AddAttribute 
(HtmlTextWriterAttribute.Disabled, "disabled");
-                               //need_span = true;
+                               need_span = true;
                        }
 
                        string tt = ToolTip;

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to