Page.Validate() is called when CausesValidation=true

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

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/EditCommandColumn.cs b/mcs/class/System.Web/System.Web.UI.WebControls/EditCommandColumn.cs
index bbb627627f822cf94e683a2918697a8c34ab5384..ded2f49a8bb2928ff6016ea5a7a1e287a24a6136 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/EditCommandColumn.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/EditCommandColumn.cs
@@ -24,10 +24,14 @@
 //
 //
 
-using System;
-using System.Web.UI;
+using System.ComponentModel;
+using System.Security.Permissions;
 
 namespace System.Web.UI.WebControls {
+
+       // CAS
+       [AspNetHostingPermissionAttribute (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
+       [AspNetHostingPermissionAttribute (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
        public class EditCommandColumn : DataGridColumn {
                #region Public Constructors
                public EditCommandColumn() {
@@ -51,6 +55,10 @@ namespace System.Web.UI.WebControls {
                        }
                }
 
+#if NET_2_0
+               [DefaultValue ("")]
+               [Localizable (true)]
+#endif
                public virtual string CancelText {
                        get {
                                return ViewState.GetString("CancelText", string.Empty);
@@ -61,6 +69,10 @@ namespace System.Web.UI.WebControls {
                        }
                }
 
+#if NET_2_0
+               [DefaultValue ("")]
+               [Localizable (true)]
+#endif
                public virtual string EditText {
                        get {
                                return ViewState.GetString("EditText", string.Empty);
@@ -71,6 +83,10 @@ namespace System.Web.UI.WebControls {
                        }
                }
 
+#if NET_2_0
+               [DefaultValue ("")]
+               [Localizable (true)]
+#endif
                public virtual string UpdateText {
                        get {
                                return ViewState.GetString("UpdateText", string.Empty);
@@ -120,7 +136,7 @@ namespace System.Web.UI.WebControls {
                        LinkButton d;
 
                        if (type == ButtonColumnType.LinkButton) {
-                               d = new LinkButton();
+                               d = new ForeColorLinkButton();
                                d.Text = text;
                                d.CommandName = command;
                                d.CausesValidation = valid;