refactoring: Button, ImageButton and LinkButton are used insted internal DataControlB...

[mono.git] / mcs / class / System.Web / System.Web.UI.WebControls / CompareValidator.cs

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/CompareValidator.cs b/mcs/class/System.Web/System.Web.UI.WebControls/CompareValidator.cs
index 6ef46ecf7ea88ad1c69a44acbb7dc86280b14496..26d89229f540503857a02f16b9925a6b159d08ce 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/CompareValidator.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/CompareValidator.cs
@@ -26,13 +26,20 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System.Web;
-using System.Web.UI.WebControls;
 using System.Globalization;
 using System.ComponentModel;
+using System.Security.Permissions;
 
 namespace System.Web.UI.WebControls {
+       // CAS
+       [AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
+       [AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
+       // attributes
+#if NET_2_0
+       [ToolboxData("<{0}:CompareValidator runat=\"server\" ErrorMessage=\"CompareValidator\"></{0}:CompareValidator>")]
+#else
        [ToolboxData("<{0}:CompareValidator runat=server ErrorMessage=\"CompareValidator\"></{0}:CompareValidator>")]
+#endif
        public class CompareValidator : BaseCompareValidator
        {
                public CompareValidator ()
@@ -62,7 +69,7 @@ namespace System.Web.UI.WebControls {
                                return base.ControlPropertiesValid();
 
                        /* attempt to locate the ControlToCompare somewhere on the page */
-                       Control control = Page.FindControl (ControlToCompare);
+                       Control control = NamingContainer.FindControl (ControlToCompare);
                        if (control == null)
                                throw new HttpException (String.Format ("Unable to locate ControlToCompare with id `{0}'", ControlToCompare));
 
@@ -88,39 +95,37 @@ namespace System.Web.UI.WebControls {
                [TypeConverter(typeof(System.Web.UI.WebControls.ValidatedControlConverter))]
                [WebSysDescription ("")]
                [WebCategory ("Behavior")]
+#if NET_2_0
+               [Themeable (false)]
+#endif
                public string ControlToCompare {
-                       get {
-                               return ViewState.GetString ("ControlToCompare", String.Empty);
-                       }
-                       set {
-                               ViewState["ControlToCompare"] = value;
-                       }
+                       get { return ViewState.GetString ("ControlToCompare", String.Empty); }
+                       set { ViewState["ControlToCompare"] = value; }
                }
 
                [DefaultValue(ValidationCompareOperator.Equal)]
                [WebSysDescription ("")]
                [WebCategory ("Behavior")]
+#if NET_2_0
+               [Themeable (false)]
+#endif
                public ValidationCompareOperator Operator {
-                       get {
-                               return (ValidationCompareOperator)ViewState.GetInt ("Operator", (int)ValidationCompareOperator.Equal);
-                       }
-
-                       set {
-                               ViewState ["Operator"] = (int)value;
-                       }
+                       get { return (ValidationCompareOperator)ViewState.GetInt ("Operator", (int)ValidationCompareOperator.Equal); }
+                       set { ViewState ["Operator"] = (int)value; }
                }
 
+#if !NET_2_0
                [Bindable(true)]
+#endif
                [DefaultValue("")]
                [WebSysDescription ("")]
                [WebCategory ("Behavior")]
+#if NET_2_0
+               [Themeable (false)]
+#endif
                public string ValueToCompare {
-                       get {
-                               return ViewState.GetString ("ValueToCompare", String.Empty);
-                       }
-                       set {
-                               ViewState ["ValueToCompare"] = value;
-                       }
+                       get { return ViewState.GetString ("ValueToCompare", String.Empty); }
+                       set { ViewState ["ValueToCompare"] = value; }
                }
        }
 }