diff options
| author | Sanja Gupta <sanjay@mono-cvs.ximian.com> | 2004-08-23 17:36:36 +0400 |
|---|---|---|
| committer | Sanja Gupta <sanjay@mono-cvs.ximian.com> | 2004-08-23 17:36:36 +0400 |
| commit | ff0330558fda39458c2bb5d9c7e3d9ce36fbeab7 (patch) | |
| tree | 5c3b63fceb1dc2885059a149e26b0adf641c4e65 /mcs/class/System.Web | |
| parent | fa61a520e3a220e82d33c6c9d110305466218b7c (diff) | |
ChangeLog: Updated ChangeLog.
Literal.cs: Added new attributes and property for .Net 2.0
svn path=/trunk/mcs/; revision=32697
Diffstat (limited to 'mcs/class/System.Web')
| -rw-r--r-- | mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog | 4 | ||||
| -rw-r--r-- | mcs/class/System.Web/System.Web.UI.WebControls/Literal.cs | 28 |
2 files changed, 32 insertions, 0 deletions
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog b/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog index 667d3dc0f78..7dbf7882913 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog +++ b/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog @@ -1,3 +1,7 @@ +2004-08-18 Sanjay Gupta <gsanjay@novell.com> + + * Literal.cs: Added new attributes and property for .Net 2.0 + 2004-08-13 Sanjay Gupta <gsanjay@novell.com> * GridViewDeleteEventArgs.cs: Removed extra code. diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/Literal.cs b/mcs/class/System.Web/System.Web.UI.WebControls/Literal.cs index 0e001188b99..ffd17141577 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/Literal.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/Literal.cs @@ -4,9 +4,12 @@ // Authors: // Gaurav Vaish (gvaish@iitk.ac.in) // Andreas Nahr (ClassDevelopment@A-SoftTech.com) +// Sanjay Gupta (gsanjay@novell.com) // // (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 }
}
|