New test.

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

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/Label.cs b/mcs/class/System.Web/System.Web.UI.WebControls/Label.cs
index 52226d377e773d8b14983ed150fd54a0f5491947..28ca5b2ecfe0941e4d5c745f44758415e8bdf30f 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/Label.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/Label.cs
@@ -30,20 +30,24 @@
 //
 
 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
        [ControlBuilder(typeof(LabelControlBuilder))]
        [DataBindingHandler("System.Web.UI.Design.TextDataBindingHandler, " + Consts.AssemblySystem_Design)]
        [DefaultProperty("Text")]
        [Designer("System.Web.UI.Design.WebControls.LabelDesigner, " + Consts.AssemblySystem_Design, "System.ComponentModel.Design.IDesigner")]
+       [ParseChildren (false)]
 #if NET_2_0
        [ToolboxData("<{0}:Label runat=\"server\" Text=\"Label\"></{0}:Label>")]
-       [ParseChildren(false, ChildControlType = typeof(Control))]
        [ControlValueProperty ("Text", null)]
 #else  
        [ToolboxData("<{0}:Label runat=server>Label</{0}:Label>")]
-       [ParseChildren(false)]
 #endif         
        public class Label : WebControl
 #if NET_2_0
@@ -117,6 +121,17 @@ namespace System.Web.UI.WebControls {
                        }
                }
 
+#if NET_2_0
+               protected internal 
+#else
+               protected
+#endif
+               override void OnPreRender (EventArgs e)
+               {
+                       base.OnPreRender (e);
+                       ControlStyle.AlwaysRenderTextDecoration = true;
+               }
+               
 #if NET_2_0
                protected internal
 #else