Переглянути джерело

ChangeLog: Updated ChangeLog.
Literal.cs: Added new attributes and property for .Net 2.0

svn path=/trunk/mcs/; revision=32697

Sanja Gupta 21 роки тому
батько
коміт
ff0330558f

+ 4 - 0
mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog

@@ -1,3 +1,7 @@
+2004-08-18  Sanjay Gupta <[email protected]>
+
+	* Literal.cs: Added new attributes and property for .Net 2.0
+
 2004-08-13  Sanjay Gupta <[email protected]>
 
 	* GridViewDeleteEventArgs.cs: Removed extra code.

+ 28 - 0
mcs/class/System.Web/System.Web.UI.WebControls/Literal.cs

@@ -4,9 +4,12 @@
 // Authors:
 //   Gaurav Vaish ([email protected])
 //   Andreas Nahr ([email protected])
+//   Sanjay Gupta ([email protected])
 //
 // (C) Gaurav Vaish (2002)
 // (C) 2003 Andreas Nahr
+// (C) 2004, Novell, Inc. (http://www.novell.com)
+//
 //
 
 //
@@ -40,7 +43,13 @@ namespace System.Web.UI.WebControls
 	[DefaultProperty("Text")]
 	[ControlBuilder(typeof(LiteralControlBuilder))]
 	[DataBindingHandler("System.Web.UI.Design.TextDataBindingHandler, " + Consts.AssemblySystem_Design)]
+#if NET_2_0
+	[DesignerAttribute ("Value not found")]
+#endif
 	public class Literal : Control
+#if NET_2_0
+//	, IStaticTextControl
+#endif
 	{
 		public Literal () : base ()
 		{
@@ -48,6 +57,9 @@ namespace System.Web.UI.WebControls
 
 		[DefaultValue (""), Bindable (true), WebCategory ("Appearance")]
 		[WebSysDescription ("The text for the literal WebControl.")]
+#if NET_2_0
+		[Localizable (true)]
+#endif
 		public string Text
 		{
 			get {
@@ -78,6 +90,22 @@ namespace System.Web.UI.WebControls
 			if (Text.Length > 0)
 				writer.Write (Text);
 		}
+
+#if NET_2_0
+		private LiteralMode literalMode;
+		[DefaultValue (LiteralMode.Transform), WebCategory ("Behavior"), WebSysDescription ("Determines whether the text is transformed or encoded")]
+		public LiteralMode Mode {
+			get { return literalMode; }
+			set { literalMode = value; }
+		}
+
+		//No information as to which Focus() method is being overridden
+		/*[MonoTODO]
+		public override void Focus ()
+		{
+			throw new Exception ("No information provided"); 
+		}*/
+#endif
 	}
 }