* TreeView.cs: fixed RegisterStyle, style names should be without leading underscore...

svn path=/trunk/mcs/; revision=71196

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog b/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
index 7d61422241dbcc9dfef0a2fc64a19784bc6ded23..6f6631d9073f3472721d92d55e34bb5451205708 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-17  Vladimir Krasnov  <vladimirk@mainsoft.com>
+
+       * TreeView.cs: fixed RegisterStyle, style names should be without
+       leading underscore. fixed RenderNode, node icons should be taken also
+       from level styles
+
 2007-01-17  Adar Wesley <adarw@mainsoft.com>
 
        * Repeater.cs: refactored GetData to return data both from DataSource

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/TreeView.cs b/mcs/class/System.Web/System.Web.UI.WebControls/TreeView.cs
index cce90c5b79056eebcc4fcedd4d67674b1cf383e7..f4d51f1991c1408cac57b527b4ccfec6e3e40aef 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/TreeView.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/TreeView.cs
@@ -1166,7 +1166,7 @@ namespace System.Web.UI.WebControls
                void RegisterStyle (Style baseStyle) {
                        if (Page.Header == null)
                                return;
-                       string className = IncrementStyleClassName ();
+                       string className = IncrementStyleClassName ().Trim ('_');
                        baseStyle.SetRegisteredCssClass (className);
                        Page.Header.StyleSheet.CreateStyleRule (baseStyle, this, "." + className);
                }
@@ -1382,6 +1382,9 @@ namespace System.Web.UI.WebControls
                                        imageUrl = GetNodeIconUrl (imageStyle.LeafIcon);
                        }
                        
+                       if (level < LevelStyles.Count && LevelStyles [level].ImageUrl != null)
+                               imageUrl = ResolveClientUrl (LevelStyles [level].ImageUrl);
+                       
                        if (!String.IsNullOrEmpty (imageUrl)) {
                                writer.RenderBeginTag (HtmlTextWriterTag.Td);   // TD
                                BeginNodeTag (writer, node, clientExpand);