eglib: checking for locale_charset function

[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
index 2cbf29db3178a124abc6ecff4e57ad63e51eabe5..f37cd4a78d93564eb3673a27af2febe4482f30d3 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/DataBoundLiteralControl.cs
+++ b/mcs/class/System.Web/System.Web.UI/DataBoundLiteralControl.cs
@@ -6,7 +6,7 @@
 //     Gonzalo Paniagua Javier (gonzalo@ximian.com)
 //
 // (C) 2002 Ximian, Inc. (http://www.ximian.com)
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
+// Copyright (C) 2005-2010 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
@@ -38,10 +38,7 @@ namespace System.Web.UI {
        [AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
        // attributes
        [ToolboxItem(false)]
-       public sealed class DataBoundLiteralControl : Control
-#if NET_2_0
-       , ITextControl
-#endif
+       public sealed class DataBoundLiteralControl : Control, ITextControl
        {
                int staticLiteralsCount;
                string [] staticLiterals;
@@ -51,7 +48,6 @@ namespace System.Web.UI {
                                                int dataBoundLiteralCount)
                {
                        this.staticLiteralsCount = staticLiteralsCount;
-                       staticLiterals = new string [staticLiteralsCount];
                        dataBoundLiterals = new string [dataBoundLiteralCount];
                        AutoID = false;
                }
@@ -87,12 +83,7 @@ namespace System.Web.UI {
                        }
                }
 
-#if NET_2_0
-               protected internal
-#else
-               protected
-#endif
-               override void Render (HtmlTextWriter output)
+               protected internal override void Render (HtmlTextWriter output)
                {
                        int stLength = staticLiterals == null ? 0 : staticLiterals.Length;
                        int dbLength = dataBoundLiterals.Length;
@@ -125,7 +116,6 @@ namespace System.Web.UI {
                        staticLiterals [index] = s;
                }
 
-#if NET_2_0
                string ITextControl.Text {
                        get {
                                return Text;
@@ -134,7 +124,6 @@ namespace System.Web.UI {
                                throw new NotSupportedException ();
                        }
                }
-#endif         
        }
 }