Author: lluis
Date: 2005-03-23 12:21:26 -0500 (Wed, 23 Mar 2005)
New Revision: 42155
Modified:
trunk/mcs/class/System.Web/System.Web.UI/ChangeLog
trunk/mcs/class/System.Web/System.Web.UI/Control.cs
trunk/mcs/class/System.Web/System.Web.UI/HtmlTextWriter.cs
trunk/mcs/class/System.Web/System.Web.UI/HtmlTextWriterAttribute.cs
Log:
2005-03-23 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* Control.cs: Added a new internal property: HasRenderMethodDelegate.
* HtmlTextWriterAttribute.cs: Replaced wrong enum value.
* HtmlTextWriter.cs: Register new ASP.NET 2.0 attributes
Modified: trunk/mcs/class/System.Web/System.Web.UI/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI/ChangeLog 2005-03-23 17:20:57 UTC
(rev 42154)
+++ trunk/mcs/class/System.Web/System.Web.UI/ChangeLog 2005-03-23 17:21:26 UTC
(rev 42155)
@@ -1,3 +1,9 @@
+2005-03-23 Lluis Sanchez Gual <[EMAIL PROTECTED]>
+
+ * Control.cs: Added a new internal property: HasRenderMethodDelegate.
+ * HtmlTextWriterAttribute.cs: Replaced wrong enum value.
+ * HtmlTextWriter.cs: Register new ASP.NET 2.0 attributes
+
2005-03-16 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* ClientScriptManager.cs: Fix build.
Modified: trunk/mcs/class/System.Web/System.Web.UI/Control.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI/Control.cs 2005-03-23 17:20:57 UTC
(rev 42154)
+++ trunk/mcs/class/System.Web/System.Web.UI/Control.cs 2005-03-23 17:21:26 UTC
(rev 42155)
@@ -839,6 +839,10 @@
HttpResponse resp = Context.Response;
return resp.ApplyAppPathModifier (UrlUtils.Combine (ts,
relativeUrl));
}
+
+ internal bool HasRenderMethodDelegate () {
+ return _renderMethodDelegate != null;
+ }
[EditorBrowsable (EditorBrowsableState.Advanced)]
public void SetRenderMethodDelegate(RenderMethod renderMethod)
//DIT
Modified: trunk/mcs/class/System.Web/System.Web.UI/HtmlTextWriter.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI/HtmlTextWriter.cs 2005-03-23
17:20:57 UTC (rev 42154)
+++ trunk/mcs/class/System.Web/System.Web.UI/HtmlTextWriter.cs 2005-03-23
17:21:26 UTC (rev 42155)
@@ -136,9 +136,13 @@
HtmlTextWriter.RegisterTag("wbr", HtmlTextWriterTag.Wbr,
TagType.NonClosing);
HtmlTextWriter.RegisterTag("xml", HtmlTextWriterTag.Xml, TagType.Other);
- HtmlTextWriter._attrKeyLookupTable = new
Hashtable(40,CaseInsensitiveHashCodeProvider.Default,
-
CaseInsensitiveComparer.Default);
+#if NET_2_0
+ HtmlTextWriter._attrNameLookupArray = new AttributeInformation[54];
+#else
HtmlTextWriter._attrNameLookupArray = new AttributeInformation[40];
+#endif
+ HtmlTextWriter._attrKeyLookupTable = new Hashtable
(HtmlTextWriter._attrNameLookupArray.Length,
+
CaseInsensitiveHashCodeProvider.Default, CaseInsensitiveComparer.Default);
HtmlTextWriter.RegisterAttribute("accesskey",
HtmlTextWriterAttribute.Accesskey, true);
HtmlTextWriter.RegisterAttribute("align",
HtmlTextWriterAttribute.Align, false);
HtmlTextWriter.RegisterAttribute("alt", HtmlTextWriterAttribute.Alt,
true);
@@ -179,6 +183,22 @@
HtmlTextWriter.RegisterAttribute("value",
HtmlTextWriterAttribute.Value, true);
HtmlTextWriter.RegisterAttribute("width",
HtmlTextWriterAttribute.Width, false);
HtmlTextWriter.RegisterAttribute("wrap", HtmlTextWriterAttribute.Wrap,
false);
+#if NET_2_0
+ HtmlTextWriter.RegisterAttribute("abbr", HtmlTextWriterAttribute.Abbr,
false);
+ HtmlTextWriter.RegisterAttribute("autocomplete",
HtmlTextWriterAttribute.AutoComplete, false);
+ HtmlTextWriter.RegisterAttribute("axis", HtmlTextWriterAttribute.Axis,
false);
+ HtmlTextWriter.RegisterAttribute("content",
HtmlTextWriterAttribute.Content, false);
+ HtmlTextWriter.RegisterAttribute("coords",
HtmlTextWriterAttribute.Coords, false);
+ HtmlTextWriter.RegisterAttribute("_designerRegion",
HtmlTextWriterAttribute.DesignerRegion, false);
+ HtmlTextWriter.RegisterAttribute("dir", HtmlTextWriterAttribute.Dir,
false);
+ HtmlTextWriter.RegisterAttribute("headers",
HtmlTextWriterAttribute.Headers, false);
+ HtmlTextWriter.RegisterAttribute("longdesc",
HtmlTextWriterAttribute.Longdesc, false);
+ HtmlTextWriter.RegisterAttribute("rel", HtmlTextWriterAttribute.Rel,
false);
+ HtmlTextWriter.RegisterAttribute("scope",
HtmlTextWriterAttribute.Scope, false);
+ HtmlTextWriter.RegisterAttribute("shape",
HtmlTextWriterAttribute.Shape, false);
+ HtmlTextWriter.RegisterAttribute("usemap",
HtmlTextWriterAttribute.Usemap, false);
+ HtmlTextWriter.RegisterAttribute("vcard_name",
HtmlTextWriterAttribute.VCardName, false);
+#endif
#if NET_2_0
HtmlTextWriter._styleNameLookupArray = new String[42];
Modified: trunk/mcs/class/System.Web/System.Web.UI/HtmlTextWriterAttribute.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI/HtmlTextWriterAttribute.cs
2005-03-23 17:20:57 UTC (rev 42154)
+++ trunk/mcs/class/System.Web/System.Web.UI/HtmlTextWriterAttribute.cs
2005-03-23 17:21:26 UTC (rev 42155)
@@ -73,7 +73,7 @@
#if NET_2_0
Abbr = 40,
AutoComplete = 41,
- Category = 42,
+ Axis = 42,
Content = 43,
Coords = 44,
DesignerRegion = 45,
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
