2008-10-24 Marek Habersack <mhabersack@novell.com>

[mono.git] / mcs / class / System.Web / System.Web.UI.HtmlControls / HtmlInputCheckBox.cs

diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputCheckBox.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputCheckBox.cs
index a0981cfa2079264ef438223dacc1d0310e057956..2b8f7568fc1f6d27b4bdbda4452d51646d6cc6b0 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputCheckBox.cs
+++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputCheckBox.cs
@@ -73,7 +73,7 @@ namespace System.Web.UI.HtmlControls
                        }
                }
                
-               private static readonly object EventServerChange = new object ();
+               static readonly object EventServerChange = new object ();
 
                [WebSysDescription("")]
                [WebCategory("Action")]
@@ -87,6 +87,15 @@ namespace System.Web.UI.HtmlControls
                        }
                }
 
+#if NET_2_0
+               protected override void RenderAttributes (HtmlTextWriter writer)
+               {
+                       if (Page != null)
+                               Page.ClientScript.RegisterForEventValidation (UniqueID);
+                       base.RenderAttributes (writer);
+               }
+#endif
+
 #if NET_2_0
                protected internal
 #else
@@ -96,8 +105,11 @@ namespace System.Web.UI.HtmlControls
                {
                        base.OnPreRender (e);
 
-                       if (Page != null) {
+                       if (Page != null && !Disabled) {
                                Page.RegisterRequiresPostBack (this);
+#if NET_2_0
+                               Page.RegisterEnabledControl (this);
+#endif
                        }
                }
 
@@ -137,6 +149,7 @@ namespace System.Web.UI.HtmlControls
 
                protected virtual void RaisePostDataChangedEvent ()
                {
+                       ValidateEvent (UniqueID, String.Empty);
                        RaisePostDataChangedEventInternal ();
                }
 #endif