X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem.Web%2FSystem.Web.UI%2FHtmlTextWriter.cs;h=e43791f79671994dedb42f3f7b8a37edd0209b9b;hb=c39145af2464b19374fac41b252e07480ae1a197;hp=c8a754786e13349d46c508d03f25b7fd687419d7;hpb=699e59742843044f6efa1726b7cb64f19d909e64;p=mono.git

diff --git a/mcs/class/System.Web/System.Web.UI/HtmlTextWriter.cs b/mcs/class/System.Web/System.Web.UI/HtmlTextWriter.cs
index c8a754786e1..e43791f7967 100644
--- a/mcs/class/System.Web/System.Web.UI/HtmlTextWriter.cs
+++ b/mcs/class/System.Web/System.Web.UI/HtmlTextWriter.cs
@@ -180,9 +180,13 @@ static HtmlTextWriter(){
 	HtmlTextWriter.RegisterAttribute("width", HtmlTextWriterAttribute.Width, false);
 	HtmlTextWriter.RegisterAttribute("wrap", HtmlTextWriterAttribute.Wrap, false);
 
-	HtmlTextWriter._styleKeyLookupTable = new Hashtable(14,CaseInsensitiveHashCodeProvider.Default,
-								CaseInsensitiveComparer.Default);
+#if NET_2_0
+	HtmlTextWriter._styleNameLookupArray = new String[42];
+#else
 	HtmlTextWriter._styleNameLookupArray = new String[14];
+#endif
+	HtmlTextWriter._styleKeyLookupTable = new Hashtable (HtmlTextWriter._styleNameLookupArray.Length,
+								CaseInsensitiveHashCodeProvider.Default, CaseInsensitiveComparer.Default);
 	HtmlTextWriter.RegisterStyle("background-color", HtmlTextWriterStyle.BackgroundColor);
 	HtmlTextWriter.RegisterStyle("background-image", HtmlTextWriterStyle.BackgroundImage);
 	HtmlTextWriter.RegisterStyle("border-collapse", HtmlTextWriterStyle.BorderCollapse);
@@ -197,6 +201,36 @@ static HtmlTextWriter(){
 	HtmlTextWriter.RegisterStyle("height", HtmlTextWriterStyle.Height);
 	HtmlTextWriter.RegisterStyle("text-decoration", HtmlTextWriterStyle.TextDecoration);
 	HtmlTextWriter.RegisterStyle("width", HtmlTextWriterStyle.Width);
+#if NET_2_0
+	HtmlTextWriter.RegisterStyle("list-style-image", HtmlTextWriterStyle.ListStyleImage);
+	HtmlTextWriter.RegisterStyle("list-style-type", HtmlTextWriterStyle.ListStyleType);
+	HtmlTextWriter.RegisterStyle("cursor", HtmlTextWriterStyle.Cursor);
+	HtmlTextWriter.RegisterStyle("direction", HtmlTextWriterStyle.Direction);
+	HtmlTextWriter.RegisterStyle("display", HtmlTextWriterStyle.Display);
+	HtmlTextWriter.RegisterStyle("filter", HtmlTextWriterStyle.Filter);
+	HtmlTextWriter.RegisterStyle("font-variant", HtmlTextWriterStyle.FontVariant);
+	HtmlTextWriter.RegisterStyle("left", HtmlTextWriterStyle.Left);
+	HtmlTextWriter.RegisterStyle("margin", HtmlTextWriterStyle.Margin);
+	HtmlTextWriter.RegisterStyle("margin-bottom", HtmlTextWriterStyle.MarginBottom);
+	HtmlTextWriter.RegisterStyle("margin-left", HtmlTextWriterStyle.MarginLeft);
+	HtmlTextWriter.RegisterStyle("margin-right", HtmlTextWriterStyle.MarginRight);
+	HtmlTextWriter.RegisterStyle("margin-top", HtmlTextWriterStyle.MarginTop);
+	HtmlTextWriter.RegisterStyle("overflow", HtmlTextWriterStyle.Overflow);
+	HtmlTextWriter.RegisterStyle("overflow-x", HtmlTextWriterStyle.OverflowX);
+	HtmlTextWriter.RegisterStyle("overflow-y", HtmlTextWriterStyle.OverflowY);
+	HtmlTextWriter.RegisterStyle("padding", HtmlTextWriterStyle.Padding);
+	HtmlTextWriter.RegisterStyle("padding-bottom", HtmlTextWriterStyle.PaddingBottom);
+	HtmlTextWriter.RegisterStyle("padding-left", HtmlTextWriterStyle.PaddingLeft);
+	HtmlTextWriter.RegisterStyle("padding-right", HtmlTextWriterStyle.PaddingRight);
+	HtmlTextWriter.RegisterStyle("padding-top", HtmlTextWriterStyle.PaddingTop);
+	HtmlTextWriter.RegisterStyle("position", HtmlTextWriterStyle.Position);
+	HtmlTextWriter.RegisterStyle("text-align", HtmlTextWriterStyle.TextAlign);
+	HtmlTextWriter.RegisterStyle("text-overflow", HtmlTextWriterStyle.TextOverflow);
+	HtmlTextWriter.RegisterStyle("top", HtmlTextWriterStyle.Top);
+	HtmlTextWriter.RegisterStyle("visibility", HtmlTextWriterStyle.Visibility);
+	HtmlTextWriter.RegisterStyle("white-space", HtmlTextWriterStyle.WhiteSpace);
+	HtmlTextWriter.RegisterStyle("z-index", HtmlTextWriterStyle.ZIndex);
+#endif
 }
 
 public HtmlTextWriter(TextWriter writer):this(writer, "	"){}
@@ -361,6 +395,10 @@ protected HtmlTextWriterStyle GetStyleKey(string styleName){
 }
 
 protected string GetStyleName(HtmlTextWriterStyle styleKey){
+	return StaticGetStyleName (styleKey);
+}
+
+internal static string StaticGetStyleName (HtmlTextWriterStyle styleKey){
 	if ((int) styleKey >= 0 && (int) styleKey < HtmlTextWriter._styleNameLookupArray.Length)
 		return HtmlTextWriter._styleNameLookupArray[(int) styleKey];
 	return System.String.Empty;