New test.

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

diff --git a/mcs/class/System.Web/System.Web.UI/DataBoundLiteralControl.cs b/mcs/class/System.Web/System.Web.UI/DataBoundLiteralControl.cs
old mode 100755 (executable)
new mode 100644 (file)
index fbe26ca..99a66a6
--- a/mcs/class/System.Web/System.Web.UI/DataBoundLiteralControl.cs
+++ b/mcs/class/System.Web/System.Web.UI/DataBoundLiteralControl.cs
@@ -1,13 +1,12 @@
 //
-// System.Web.UI.DataBoundLiteralCOntrol.cs
+// System.Web.UI.DataBoundLiteralControl.cs
 //
 // Authors:
 //     Duncan Mak  (duncan@ximian.com)
 //     Gonzalo Paniagua Javier (gonzalo@ximian.com)
 //
 // (C) 2002 Ximian, Inc. (http://www.ximian.com)
-//
-
+// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -29,14 +28,20 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
 using System.ComponentModel;
+using System.Security.Permissions;
 using System.Text;
 
 namespace System.Web.UI {
 
+       // CAS - no InheritanceDemand here as the class is sealed
+       [AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
+       // attributes
        [ToolboxItem(false)]
        public sealed class DataBoundLiteralControl : Control
+#if NET_2_0
+       , ITextControl
+#endif
        {
                private string [] staticLiterals;
                private string [] dataBoundLiterals;
@@ -46,7 +51,7 @@ namespace System.Web.UI {
                {
                        staticLiterals = new string [staticLiteralsCount];
                        dataBoundLiterals = new string [dataBoundLiteralCount];
-                       PreventAutoID ();
+                       AutoID = false;
                }
 
                public string Text {
@@ -80,7 +85,12 @@ namespace System.Web.UI {
                        }
                }
 
-               protected override void Render (HtmlTextWriter output)
+#if NET_2_0
+               protected internal
+#else
+               protected
+#endif
+               override void Render (HtmlTextWriter output)
                {
                        output.Write (Text);
                }
@@ -101,6 +111,17 @@ namespace System.Web.UI {
                {
                        staticLiterals [index] = s;
                }
+
+#if NET_2_0
+               string ITextControl.Text {
+                       get {
+                               return Text;
+                       }
+                       set {
+                               throw new NotSupportedException ();
+                       }
+               }
+#endif         
        }
 }