2006-08-03 Gonzalo Paniagua Javier <gonzalo@ximian.com>
[mono.git] / mcs / class / System.Web / System.Web.UI.WebControls / WebControl.cs
old mode 100755 (executable)
new mode 100644 (file)
index 1651d8f..59d82be
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-// System.Web.UI.WebControls.WebControl.cs
+// Copyright (c) 2005 Novell, Inc. (http://www.novell.com)
 //
 // Authors:
-//   Gaurav Vaish (gvaish@iitk.ac.in)
-//   Andreas Nahr (ClassDevelopment@A-SoftTech.com)
+//     Peter Bartok    (pbartok@novell.com)
 //
-// (C) Gaurav Vaish (2002)
-// (C) 2003 Andreas Nahr
 //
 
-using System;
-using System.Collections;
 using System.ComponentModel;
-using System.Web;
-using System.Web.UI;
 using System.Drawing;
-using System.Collections.Specialized;
-
-namespace System.Web.UI.WebControls
-{
-       [PersistChildrenAttribute(false)]
-       [ParseChildrenAttribute(true)]
-       public class WebControl : Control, IAttributeAccessor
-       {
-               HtmlTextWriterTag tagKey;
+using System.Security.Permissions;
+
+namespace System.Web.UI.WebControls {
+
+       // CAS
+       [AspNetHostingPermissionAttribute (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
+       [AspNetHostingPermissionAttribute (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
+       // attributes
+#if NET_2_0
+       [PersistChildrenAttribute (false, false)]
+       [ParseChildrenAttribute (true, ChildControlType = typeof(Control))]
+       [Themeable (true)]
+#else  
+       [PersistChildrenAttribute (false)]
+       [ParseChildrenAttribute (true)]
+#endif         
+       public class WebControl : Control, IAttributeAccessor {
+               Style style;
+               HtmlTextWriterTag tag;
+               string tag_name;
                AttributeCollection attributes;
-               StateBag attributeState;
-               Style controlStyle;
-               bool enabled = true;
-               string tagName;
+               StateBag attribute_state;
+               bool enabled;
 
-               protected WebControl () : this (HtmlTextWriterTag.Span)
+               public WebControl (HtmlTextWriterTag tag) 
                {
+                       this.tag = tag;
+                       this.enabled = true;
                }
 
-               public WebControl (HtmlTextWriterTag tag)
+               protected WebControl () : this (HtmlTextWriterTag.Span) 
                {
-                       tagKey = tag;
                }
 
-               protected WebControl (string tag)
+               protected WebControl (string tag) 
                {
-                       tagName = tag;
-               }
-
-               [DefaultValue (""), Bindable (true), WebCategory ("Behavior")]
-               [WebSysDescription ("A keyboard shortcut for the WebControl.")]\r
-               public virtual string AccessKey\r
-               {\r
-                       get\r
-                       {\r
-                               object o = ViewState["AccessKey"];\r
-                               if(o!=null)\r
-                                       return (string)o;\r
-                               return String.Empty;\r
-                       }\r
-                       set\r
-                       {
-                               if (value != null && value.Length > 1)
-                                       throw new ArgumentOutOfRangeException ("value");
-                               ViewState["AccessKey"] = value;\r
-                       }\r
-               }\r
-\r
-               [Browsable (false), DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
-               [WebSysDescription ("Attribute tags for the Webcontrol.")]\r
-               public AttributeCollection Attributes\r
-               {\r
-                       get\r
-                       {\r
-                               if(attributes==null)\r
-                               {\r
-                                       //FIXME: From where to get StateBag and how? I think this method is OK!\r
-                                       if(attributeState == null)\r
-                                       {\r
-                                               attributeState = new StateBag(true);\r
-                                               if(IsTrackingViewState)\r
-                                               {\r
-                                                       attributeState.TrackViewState();\r
-                                               }\r
-                                       }\r
-                                       attributes = new AttributeCollection(attributeState);\r
-                               }\r
-                               return attributes;\r
-                       }\r
-               }\r
-
-               [DefaultValue (null), Bindable (true), WebCategory ("Appearance")]
-               [TypeConverter (typeof (WebColorConverter))]
-               [WebSysDescription ("The background color for the WebControl.")]\r
-               public virtual Color BackColor\r
-               {\r
-                       get {\r
-                               if (!ControlStyleCreated)\r
-                                       return Color.Empty;\r
-                               return ControlStyle.BackColor;\r
-                       }\r
-\r
-                       set {\r
-                               ControlStyle.BackColor = value;\r
-                       }\r
-               }\r
-
-               [DefaultValue (null), Bindable (true), WebCategory ("Appearance")]
-               [TypeConverter (typeof (WebColorConverter))]
-               [WebSysDescription ("The border color for the WebControl.")]\r
-               public virtual Color BorderColor\r
-               {\r
-                       get {\r
-                               if (!ControlStyleCreated)\r
-                                       return Color.Empty;\r
-                               return ControlStyle.BorderColor;\r
-                       }\r
-\r
-                       set {\r
-                               ControlStyle.BorderColor = value;\r
-                       }\r
-               }\r
-
-               [DefaultValue (typeof(BorderStyle), "NotSet"), Bindable (true), WebCategory ("Appearance")]
-               [WebSysDescription ("The style/type of the border used for the WebControl.")]\r
-               public virtual BorderStyle BorderStyle\r
-               {\r
-                       get {\r
-                               if (!ControlStyleCreated)\r
-                                       return BorderStyle.NotSet;\r
-                               return ControlStyle.BorderStyle;\r
-                       }\r
-\r
-                       set {\r
-                               ControlStyle.BorderStyle = value;\r
-                       }\r
-               }\r
-
-               [DefaultValue (null), Bindable (true), WebCategory ("Appearance")]
-               [WebSysDescription ("The width of the border used for the WebControl.")]\r
-               public virtual Unit BorderWidth\r
-               {\r
-                       get {\r
-                               if (!ControlStyleCreated)\r
-                                       return Unit.Empty;\r
-                               return ControlStyle.BorderWidth;\r
-                       }\r
-\r
-                       set {\r
-                               if (value.Value < 0)\r
-                                       throw new ArgumentOutOfRangeException ("value");\r
-                               ControlStyle.BorderWidth = value;\r
-                       }\r
-               }\r
-
-               [Browsable (false), DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
-               [WebSysDescription ("The style used to display this Webcontrol.")]\r
-               public Style ControlStyle\r
-               {\r
-                       get\r
-                       {\r
-                               if(controlStyle == null)\r
-                               {\r
-                                       controlStyle = CreateControlStyle();\r
-                                       if(IsTrackingViewState)\r
-                                       {\r
-                                               controlStyle.TrackViewState();\r
-                                       }\r
-                                       controlStyle.LoadViewState(null);\r
-                               }\r
-                               return controlStyle;\r
-                       }\r
-               }\r
-
-               [Browsable (false), DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
-               [WebSysDescription ("Determines if a style exists for this Webcontrol.")]\r
-               public bool ControlStyleCreated\r
-               {\r
-                       get\r
-                       {\r
-                               return (controlStyle!=null);\r
-                       }\r
-               }\r
-
-               [DefaultValue (""), Bindable (true), WebCategory ("Appearance")]
-               [WebSysDescription ("The cascading stylesheet class that is associated with this WebControl.")]\r
-               public virtual string CssClass\r
-               {\r
-                       get\r
-                       {\r
-                               return ControlStyle.CssClass;\r
-                       }\r
-                       set\r
-                       {\r
-                               ControlStyle.CssClass = value;\r
-                       }\r
-               }\r
-
-               [DefaultValue (true), Bindable (true), WebCategory ("Behavior")]
-               [WebSysDescription ("The activation state of this WebControl.")]
+                       this.tag = HtmlTextWriterTag.Unknown;
+                       this.tag_name = tag;
+                       this.enabled = true;
+               }
+
+#if ONLY_1_1
+               [Bindable(true)]
+#endif         
+               [DefaultValue("")]
+               [WebSysDescription ("")]
+               [WebCategory ("Behavior")]
+               public virtual string AccessKey {
+                       get {
+                               return ViewState.GetString ("AccessKey", string.Empty);
+                       }
+                       set {
+                               if (value == null || value.Length < 2)
+                                       ViewState ["AccessKey"] = value;
+                               else
+                                       throw new ArgumentException ("AccessKey can only be null, empty or a single character", "value");
+                       }
+               }
+
+               [Browsable(false)]
+               [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+               [WebSysDescription ("")]
+               [WebCategory ("Behavior")]
+               public AttributeCollection Attributes {
+                       get {
+                               if (attributes == null) {
+                                       attribute_state = new StateBag (true);
+                                       if (IsTrackingViewState)
+                                               attribute_state.TrackViewState ();
+                                       
+                                       attributes = new AttributeCollection (attribute_state);
+                               }
+                               return attributes;
+                       }
+               }
+
+#if ONLY_1_1
+               [Bindable(true)]
+#endif         
+               [DefaultValue(typeof (Color), "")]
+               [TypeConverter(typeof(System.Web.UI.WebControls.WebColorConverter))]
+               [WebSysDescription ("")]
+               [WebCategory ("Appearance")]
+               public virtual Color BackColor {
+                       get {
+                               if (style == null) 
+                                       return Color.Empty;
+                               
+                               return style.BackColor;
+                       }
+                       set {
+                               ControlStyle.BackColor = value;
+                       }
+               }
+
+#if ONLY_1_1
+               [Bindable(true)]
+#endif         
+               [DefaultValue(typeof (Color), "")]
+               [TypeConverter(typeof(System.Web.UI.WebControls.WebColorConverter))]
+               [WebSysDescription ("")]
+               [WebCategory ("Appearance")]
+               public virtual Color BorderColor {
+                       get {
+                               if (style == null) 
+                                       return Color.Empty;
+
+                               return style.BorderColor;
+                       }
+
+                       set {
+                               ControlStyle.BorderColor = value;
+                       }
+               }
+
+#if ONLY_1_1
+               [Bindable(true)]
+#endif         
+               [DefaultValue(BorderStyle.NotSet)]
+               [WebSysDescription ("")]
+               [WebCategory ("Appearance")]
+               public virtual BorderStyle BorderStyle {
+                       get {
+                               if (style == null) 
+                                       return BorderStyle.NotSet;
+                               
+                               return style.BorderStyle;
+                       }
+                       set {
+                                if (value < BorderStyle.NotSet || value > BorderStyle.Outset)
+                                        throw new ArgumentOutOfRangeException ("value");
+
+                               ControlStyle.BorderStyle = value;
+                       }
+               }
+
+#if ONLY_1_1
+               [Bindable(true)]
+#endif         
+               [DefaultValue(typeof (Unit), "")]
+               [WebSysDescription ("")]
+               [WebCategory ("Appearance")]
+               public virtual Unit BorderWidth {
+                       get {
+                               if (style == null) 
+                                       return Unit.Empty;
+
+                               return style.BorderWidth;
+                       }
+                       set {
+                               ControlStyle.BorderWidth = value;
+                       }
+               }
+
+               [Browsable(false)]
+               [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+               [WebSysDescription ("")]
+               [WebCategory ("Appearance")]
+               public Style ControlStyle {
+                       get {
+                               if (style == null) {
+                                       style = this.CreateControlStyle ();
+
+                                       if (IsTrackingViewState)
+                                               style.TrackViewState ();
+                               }
+
+                               return style;
+                       }
+               }
+
+               [Browsable(false)]
+               [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+#if NET_2_0
+               [EditorBrowsable (EditorBrowsableState.Never)]
+#endif
+               public bool ControlStyleCreated {
+                       get {
+                               return style != null;
+                       }
+               }
+
+#if ONLY_1_1
+               [Bindable(true)]
+#endif         
+               [DefaultValue("")]
+               [WebSysDescription ("")]
+               [WebCategory ("Appearance")]
+               public virtual string CssClass {
+                       get {
+                               if (style == null) 
+                                       return string.Empty;
+                               
+                               return style.CssClass;
+                       }
+                       set {
+                               ControlStyle.CssClass = value;
+                       }
+               }
+
+               [Bindable(true)]
+               [DefaultValue(true)]
+#if NET_2_0
+               [Themeable (false)]
+#endif         
                public virtual bool Enabled {
                        get {
                                return enabled;
                        }
+
                        set {
                                if (enabled != value) {
                                        ViewState ["Enabled"] = value;
-                                       if (IsTrackingViewState)
-                                               EnableViewState = true;
+                                       enabled = value;
                                }
+                       }
+               }
 
-                               enabled = value;
-                       }
-               }
-
-               [DefaultValue (null), NotifyParentProperty (true), WebCategory ("Appearance")]
-               [DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
-               [WebSysDescription ("The font of this WebControl.")]\r
-               public virtual FontInfo Font\r
-               {\r
-                       get\r
-                       {\r
-                               return ControlStyle.Font;\r
-                       }\r
-               }\r
-
-               [DefaultValue (null), Bindable (true), WebCategory ("Appearance")]
-               [TypeConverter (typeof (WebColorConverter))]
-               [WebSysDescription ("The color that is used to paint the primary display of the WebControl.")]\r
-               public virtual Color ForeColor\r
-               {\r
-                       get {\r
-                               if (!ControlStyleCreated)\r
-                                       return Color.Empty;\r
-                               return ControlStyle.ForeColor;\r
-                       }\r
-\r
-                       set {\r
-                               ControlStyle.ForeColor = value;\r
-                       }\r
-               }\r
-
-               [DefaultValue (null), Bindable (true), WebCategory ("Layout")]
-               [WebSysDescription ("The height of this WebControl.")]\r
-               public virtual Unit Height\r
-               {\r
-                       get\r
-                       {\r
-                               return ControlStyle.Height;\r
-                       }\r
-                       set\r
-                       {\r
-                               if (value.Value < 0)
-                                       throw new ArgumentOutOfRangeException ("value");
-                               ControlStyle.Height = value;\r
-                       }\r
-               }\r
-
-               [Browsable (false), DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
-               [WebSysDescription ("Direct access to the styles used for this Webcontrol.")]\r
-               public CssStyleCollection Style\r
-               {\r
-                       get\r
-                       {\r
-                               return Attributes.CssStyle;\r
-                       }\r
-               }\r
-
-               [DefaultValue (0), WebCategory ("Behavior")]
-               [WebSysDescription ("The order in which this WebControl gets tabbed through.")]\r
-               public virtual short TabIndex\r
-               {\r
-                       get\r
-                       {\r
-                               object o = ViewState["TabIndex"];\r
-                               if(o!=null)\r
-                                       return (short)o;\r
-                               return 0;\r
-                       }\r
-                       set\r
-                       {\r
-                               if(value < short.MinValue || value > short.MaxValue)\r
-                                       throw new ArgumentOutOfRangeException ("value");\r
-                               ViewState["TabIndex"] = value;\r
-                       }\r
-               }\r
-
-               [DefaultValue (""), Bindable (true), WebCategory ("Behavior")]
-               [WebSysDescription ("A tooltip that is shown when hovering the mouse above the WebControl.")]\r
-               public virtual string ToolTip\r
-               {\r
-                       get\r
-                       {\r
-                               object o = ViewState["ToolTip"];\r
-                               if(o!=null)\r
-                                       return (string)o;\r
-                               return String.Empty;\r
-                       }\r
-                       set\r
-                       {\r
-                               ViewState["ToolTip"] = value;\r
-                       }\r
-               }\r
-
-               [DefaultValue (null), Bindable (true), WebCategory ("Layout")]
-               [WebSysDescription ("The width of this WebControl.")]\r
-               public virtual Unit Width\r
-               {\r
-                       get\r
-                       {\r
-                               return ControlStyle.Width;\r
-                       }\r
-                       set\r
-                       {\r
-                               if (value.Value < 0)
-                                       throw new ArgumentOutOfRangeException ("value");
-                               ControlStyle.Width = value;\r
-                       }\r
-               }\r
-
-               public void ApplyStyle(Style s)
+#if NET_2_0
+               [Browsable (true)]
+               [MonoTODO]
+               public virtual new bool EnableTheming
+               {
+                       get { return base.EnableTheming; }
+                       set { base.EnableTheming = value; }
+               }
+#endif         
+
+#if ONLY_1_1
+               [DefaultValue(null)]
+#endif         
+               [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+               [NotifyParentProperty(true)]
+               [WebSysDescription ("")]
+               [WebCategory ("Appearance")]
+               public virtual FontInfo Font {
+                       get {
+                               // Oddly enough, it looks like we have to let it create the style
+                               // since we can't create a FontInfo without a style owner
+                               return ControlStyle.Font;
+                       }
+               }
+
+#if ONLY_1_1
+               [Bindable(true)]
+#endif         
+               [DefaultValue(typeof (Color), "")]
+               [TypeConverter(typeof(System.Web.UI.WebControls.WebColorConverter))]
+               [WebSysDescription ("")]
+               [WebCategory ("Appearance")]
+               public virtual Color ForeColor {
+                       get {
+                               if (style == null) 
+                                       return Color.Empty;
+                               
+                               return style.ForeColor;
+                       }
+                       set {
+                               ControlStyle.ForeColor = value;
+                       }
+               }
+
+#if NET_2_0
+               [Browsable (false)]
+               [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
+               [MonoTODO]
+               public bool HasAttributes 
+               {
+                       get {
+                               throw new NotImplementedException ();
+                       }
+               }
+#endif         
+               
+#if ONLY_1_1
+               [Bindable(true)]
+#endif         
+               [DefaultValue(typeof (Unit), "")]
+               [WebSysDescription ("")]
+               [WebCategory ("Layout")]
+               public virtual Unit Height {
+                       get {
+                               if (style == null) 
+                                       return Unit.Empty;
+                               
+                               return style.Height;
+                       }
+                       set {
+                               ControlStyle.Height = value;
+                       }
+               }
+
+#if NET_2_0
+               [Browsable (true)]
+               [MonoTODO]
+               public virtual new string SkinID
+               {
+                       get { return base.SkinID; }
+                       set { base.SkinID = value; }
+               }
+#endif         
+               
+               [Browsable(false)]
+               [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+               [WebSysDescription ("")]
+               [WebCategory ("Style")]
+               public CssStyleCollection Style {
+                       get {
+                               return Attributes.CssStyle;
+                       }
+               }
+
+               [DefaultValue((short)0)]
+               [WebSysDescription ("")]
+               [WebCategory ("Behavior")]
+               public virtual short TabIndex {
+                       get {
+                               return ViewState.GetShort ("TabIndex", 0);
+                       }
+                       set {
+                               ViewState ["TabIndex"] = value;
+                       }
+               }
+
+#if ONLY_1_1
+               [Bindable(true)]
+#endif         
+               [DefaultValue("")]
+#if NET_2_0
+               [Localizable (true)]
+#endif         
+               [WebSysDescription ("")]
+               [WebCategory ("Behavior")]
+               public virtual string ToolTip {
+                       get {
+                               return ViewState.GetString ("ToolTip", string.Empty);
+                       }
+                       set {
+                               ViewState ["ToolTip"] = value;
+                       }
+               }
+
+#if ONLY_1_1
+               [Bindable(true)]
+#endif         
+               [DefaultValue(typeof (Unit), "")]
+               [WebSysDescription ("")]
+               [WebCategory ("Layout")]
+               public virtual Unit Width {
+                       get {
+                               if (style == null) 
+                                       return Unit.Empty;
+                               
+                               return style.Width;
+                       }
+                       set {
+                               ControlStyle.Width = value;
+                       }
+               }
+
+               [Browsable(false)]
+               [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+               protected virtual HtmlTextWriterTag TagKey {
+                       get {
+                               return tag;
+                       }
+               }
+
+               [Browsable(false)]
+               [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+               protected virtual string TagName {
+                       get {
+                               // do this here to avoid potentially costly lookups on every control
+                               if (tag_name == null)
+                                       tag_name = HtmlTextWriter.StaticGetTagName (TagKey);
+                               
+                               return tag_name;
+                       }
+               }
+
+#if NET_2_0
+               [MonoTODO]
+               protected internal bool IsEnabled 
+               {
+                       get {
+                               throw new NotImplementedException ();
+                       }
+               }
+#endif         
+               
+
+               public void ApplyStyle (Style s) 
+               {
+                       if (s != null && !s.IsEmpty)
+                               ControlStyle.CopyFrom(s);
+               }
+
+               public void CopyBaseAttributes (WebControl controlSrc) 
+               {
+                       object o;
+
+                       if (controlSrc == null) 
+                               return;
+
+                       o = controlSrc.ViewState ["Enabled"];
+                       if (o != null) {
+                               enabled = (bool)o;
+                       }
+
+                       o = controlSrc.ViewState ["AccessKey"];
+                       if (o != null)
+                               ViewState ["AccessKey"] = o;
+
+                       o = controlSrc.ViewState ["TabIndex"];
+                       if (o != null)
+                               ViewState ["TabIndex"] = o;
+
+                       o = controlSrc.ViewState ["ToolTip"];
+                       if (o != null)
+                               ViewState ["ToolTip"] = o;
+
+                       if (controlSrc.attributes != null)
+                               foreach (string s in controlSrc.attributes.Keys)
+                                       Attributes [s] = controlSrc.attributes [s];
+               }
+
+               public void MergeStyle (Style s) 
                {
                        if (s != null && !s.IsEmpty)
-                               ControlStyle.CopyFrom (s);
-               }
-
-               public void CopyBaseAttributes(WebControl controlSrc)\r
-               {\r
-                       /*\r
-                        * AccessKey, Enabled, ToolTip, TabIndex, Attributes\r
-                       */\r
-                       AccessKey  = controlSrc.AccessKey;\r
-                       Enabled    = controlSrc.Enabled;\r
-                       ToolTip    = controlSrc.ToolTip;\r
-                       TabIndex   = controlSrc.TabIndex;\r
-                       AttributeCollection otherAtt = controlSrc.Attributes;\r
-                       foreach (string key in otherAtt.Keys)\r
-                               Attributes [key] = otherAtt [key];\r
-               }\r
-\r
-               public void MergeStyle(Style s)\r
-               {\r
-                       ControlStyle.MergeWith(s);\r
-               }\r
-\r
-               public virtual void RenderBeginTag(HtmlTextWriter writer)\r
-               {\r
-                       AddAttributesToRender(writer);\r
-                       writer.RenderBeginTag(TagName);\r
-               }\r
-\r
-               public virtual void RenderEndTag(HtmlTextWriter writer)\r
-               {\r
-                       writer.RenderEndTag();\r
-               }\r
-\r
-               protected virtual HtmlTextWriterTag TagKey\r
-               {\r
-                       get\r
-                       {\r
-                               return tagKey;\r
-                       }\r
-               }\r
-\r
-               protected virtual string TagName\r
-               {\r
-                       get\r
-                       {\r
-                               if(tagName == null && TagKey != 0)\r
-                               {\r
-                                       tagName = Enum.Format(typeof(HtmlTextWriterTag), TagKey, "G").ToString();\r
-                               }\r
-                               // What if tagName is null and tagKey 0?\r
-                               return tagName;\r
-                       }\r
-               }\r
-\r
-               protected virtual void AddAttributesToRender(HtmlTextWriter writer)\r
-               {\r
-                       if(ID!=null)\r
-                       {\r
-                               writer.AddAttribute(HtmlTextWriterAttribute.Id, ClientID);\r
-                       }\r
-                       if(AccessKey.Length>0)\r
-                       {\r
-                               writer.AddAttribute(HtmlTextWriterAttribute.Accesskey, AccessKey);\r
-                       }\r
-                       if(!Enabled)\r
-                       {\r
-                               writer.AddAttribute(HtmlTextWriterAttribute.Disabled, "disabled");\r
-                       }\r
-                       if(ToolTip.Length>0)\r
-                       {\r
-                               writer.AddAttribute(HtmlTextWriterAttribute.Title, ToolTip);\r
-                       }\r
-                       if(TabIndex != 0)\r
-                       {\r
-                               writer.AddAttribute(HtmlTextWriterAttribute.Tabindex, TabIndex.ToString());\r
-                       }\r
-                       if(ControlStyleCreated)\r
-                       {\r
-                               if(!ControlStyle.IsEmpty)\r
-                               {\r
-                                       ControlStyle.AddAttributesToRender(writer, this);\r
-                               }\r
-                       }\r
-                       if(attributeState != null){\r
-                               IEnumerator ie = Attributes.Keys.GetEnumerator ();\r
-                               while (ie.MoveNext ()){\r
-                                       string key = (string) ie.Current;\r
-                                       writer.AddAttribute (key, Attributes [key]);\r
-                               }\r
-                       }\r
-               }\r
-
-               protected virtual Style CreateControlStyle ()
+                               ControlStyle.MergeWith(s);
+               }
+
+               public virtual void RenderBeginTag (HtmlTextWriter writer)
+               {
+                       AddAttributesToRender (writer);
+                       
+                       if (TagKey == HtmlTextWriterTag.Unknown)
+                               writer.RenderBeginTag (TagName);
+                       else
+                               writer.RenderBeginTag (TagKey);
+                       
+               }
+
+               public virtual void RenderEndTag (HtmlTextWriter writer) 
+               {
+                       writer.RenderEndTag ();
+               }
+
+               protected virtual void AddAttributesToRender (HtmlTextWriter writer) 
                {
-                       return new Style (ViewState);
+                       if (ID != null)
+                               writer.AddAttribute(HtmlTextWriterAttribute.Id, ClientID);
+
+                       if (AccessKey != string.Empty)
+                               writer.AddAttribute (HtmlTextWriterAttribute.Accesskey, AccessKey);
+
+                       if (!enabled)
+                               writer.AddAttribute (HtmlTextWriterAttribute.Disabled, "disabled");
+
+                       if (ToolTip != string.Empty)
+                               writer.AddAttribute (HtmlTextWriterAttribute.Title, ToolTip);
+
+                       if (TabIndex != 0)
+                               writer.AddAttribute (HtmlTextWriterAttribute.Tabindex, TabIndex.ToString ());
+
+                       if (style != null && !style.IsEmpty) {
+#if NET_2_0
+                               //unbelievable, but see WebControlTest.RenderBeginTag_BorderWidth_xxx
+                               if (TagKey == HtmlTextWriterTag.Span)
+                                       if (style.BorderWidth != Unit.Empty 
+                                               || style.BorderStyle != BorderStyle.NotSet)
+                                               writer.AddStyleAttribute (HtmlTextWriterStyle.Display, "inline-block");
+#endif
+                               style.AddAttributesToRender(writer, this);
+                       }
+
+                       if (attributes != null)
+                               foreach(string s in attributes.Keys)
+                                       writer.AddAttribute (s, attributes [s]);
+               }
+
+               protected virtual Style CreateControlStyle() 
+               {
+                       style = new Style (ViewState);
+                       return style;
                }
 
-               protected override void LoadViewState (object savedState)
+               protected override void LoadViewState (object savedState) 
                {
-                       if (savedState == null)
+                       if (savedState == null) {
+                               base.LoadViewState(null);
                                return;
+                       }
+
+                       Triplet triplet = (Triplet) savedState;
 
-                       Pair saved = (Pair) savedState;
-                       base.LoadViewState (saved.First);
+                       base.LoadViewState (triplet.First);
                        
-                       if (ControlStyleCreated || ViewState [System.Web.UI.WebControls.Style.selectionBitString] != null)
-                               ControlStyle.LoadViewState (null);
+                       if (triplet.Second != null) {
+                               if (attribute_state == null) {
+                                       attribute_state = new StateBag ();
+                                       if (IsTrackingViewState) 
+                                               attribute_state.TrackViewState ();
+                               }
+                               attribute_state.LoadViewState (triplet.Second);
+                               attributes = new AttributeCollection(attribute_state);
+                       }
+
+                       if (triplet.Third != null) {
+                               if (style == null)
+                                       style = CreateControlStyle ();
 
-                       if (saved.Second != null)
-                       {
-                               attributeState = new StateBag(true);
-                               attributeState.TrackViewState();
-                               attributeState.LoadViewState (saved.Second);
-                       }\r
-                       \r
-                       object enable = ViewState["Enabled"];\r
-                       if (enable!=null)\r
-                       {\r
-                               Enabled = (bool)enable;\r
-                               EnableViewState = true; \r
+                               style.LoadViewState (triplet.Third);
                        }
+
+                       enabled = ViewState.GetBool("Enabled", true);
                }
 
-               protected override void Render(HtmlTextWriter writer)
+#if NET_2_0
+               protected internal
+#else          
+               protected
+#endif         
+               override void Render (HtmlTextWriter writer)
                {
                        RenderBeginTag (writer);
                        RenderContents (writer);
                        RenderEndTag (writer);
                }
 
-               protected virtual void RenderContents(HtmlTextWriter writer)
+#if NET_2_0
+               protected internal
+#else          
+               protected
+#endif         
+               virtual void RenderContents (HtmlTextWriter writer)
                {
                        base.Render (writer);
                }
 
-               protected override object SaveViewState()
-               {\r
-                       if (EnableViewState)\r
-                               ViewState["Enabled"] = enabled;
-                       if (ControlStyleCreated)
-                               ControlStyle.SaveViewState ();
-                       
-                       object baseView = base.SaveViewState ();
-                       object attrView = null;
-                       if (attributeState != null)
-                               attrView = attributeState.SaveViewState ();
+               protected override object SaveViewState () 
+               {
+                       object view_state;
+                       object attr_view_state = null;
+                       object style_view_state = null;
+
+                       view_state = base.SaveViewState ();
+
+                       if (attribute_state != null)
+                               attr_view_state = attribute_state.SaveViewState ();
+               
+                       if (style != null)
+                               style_view_state = style.SaveViewState ();
                        
-                       if (baseView == null && attrView == null)
+                       if (view_state == null && attr_view_state == null && style_view_state == null)
                                return null;
-
-                       return new Pair (baseView, attrView);
+                       
+                       return new Triplet (view_state, attr_view_state, style_view_state);
                }
 
-               protected override void TrackViewState()
+               protected override void TrackViewState() 
                {
-                       base.TrackViewState();
-                       if (ControlStyleCreated)
-                               ControlStyle.TrackViewState ();
-                       if (attributeState != null)
-                               attributeState.TrackViewState ();
+                       if (style != null)
+                               style.TrackViewState ();
+
+                       if (attribute_state != null)
+                               attribute_state.TrackViewState ();
+
+                       base.TrackViewState ();
                }
 
-               string IAttributeAccessor.GetAttribute(string key)
+               string IAttributeAccessor.GetAttribute (string key) 
                {
                        if (attributes != null)
-                               return Attributes [key] as string;
+                               return attributes [key];
 
                        return null;
                }
 
-               void IAttributeAccessor.SetAttribute(string key, string value)
+               void IAttributeAccessor.SetAttribute (string key, string value) 
                {
                        Attributes [key] = value;
                }
        }
 }
-