X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem.Web%2FSystem.Web.UI.WebControls%2FLiteral.cs;h=7e832dec6fdc69a984d16a42dbc04b5f98dc126e;hb=69fd76078eb720a89f3420bab3fe1bc919896bec;hp=14f46e6a21cd1e5758c8ef715630c17f4ea6ad5b;hpb=04d1b4116331e3813b8f75304f714a5d61ba1214;p=mono.git

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 14f46e6a21c..7e832dec6fd 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/Literal.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/Literal.cs
@@ -38,42 +38,35 @@ namespace System.Web.UI.WebControls {
 	[ControlBuilder(typeof(LiteralControlBuilder))]
 	[DataBindingHandler("System.Web.UI.Design.TextDataBindingHandler, " + Consts.AssemblySystem_Design)]
 	[DefaultProperty("Text")]
-#if NET_2_0
 	[Designer ("System.Web.UI.Design.WebControls.LiteralDesigner, " + Consts.AssemblySystem_Design, "System.ComponentModel.Design.IDesigner")]
-#endif		
 	public class Literal : Control
-#if NET_2_0
 	, ITextControl
-#endif	
 	{
 
 		public Literal ()
 		{
 		}
 
-#if NET_2_0
 		[DefaultValue (LiteralMode.Transform)]
-		[MonoTODO]
 		[WebSysDescription ("")]
 		[WebCategory ("Behavior")]
 		public LiteralMode Mode 
 		{
 			get {
-				throw new NotImplementedException ();
+				return ViewState ["Mode"] == null ? LiteralMode.Transform : (LiteralMode) ViewState ["Mode"];
 			}
 			set {
-				throw new NotImplementedException ();
+				if (((int) value) < 0 || ((int) value) > 2)
+					throw new ArgumentOutOfRangeException ();
+				ViewState ["Mode"] = value;
 			}
 		}
-#endif		
 
 		[Bindable(true)]
 		[DefaultValue("")]
 		[WebSysDescription ("")]
 		[WebCategory ("Appearance")]
-#if NET_2_0
 		[Localizable (true)]
-#endif		
 		public string Text {
 			get {
 				return ViewState.GetString ("Text", String.Empty);
@@ -83,14 +76,11 @@ namespace System.Web.UI.WebControls {
 			}
 		}
 
-#if NET_2_0
 		[EditorBrowsable (EditorBrowsableState.Never)]
-		[MonoTODO]
 		public override void Focus ()
 		{
-			throw new NotImplementedException ();
+			throw new NotSupportedException ();
 		}
-#endif		
 
 		protected override ControlCollection CreateControlCollection ()
 		{
@@ -110,13 +100,12 @@ namespace System.Web.UI.WebControls {
 			      obj.GetType ()));
 		}
 
-#if NET_2_0
 		protected internal
-#else		
-		protected
-#endif		
 		override void Render (HtmlTextWriter output)
 		{
+			if (Mode == LiteralMode.Encode)
+				output.Write (HttpUtility.HtmlEncode (Text));
+			else
 			output.Write (Text);
 		}
 	}