2010-07-08 Marek Habersack <mhabersack@novell.com>

	* TreeView.cs: in 4.0, checkbox renders the value of the current
	node's ToolTip, if anything, and not Text.

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

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog b/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
index 48d7b9eb304687a68e5642c39bc3084dd67e3797..eb159f0c4fc739713aa536e1749fe2e1e8582118 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
@@ -1,5 +1,8 @@
 2010-07-08  Marek Habersack  <mhabersack@novell.com>
 
+       * TreeView.cs: in 4.0, checkbox renders the value of the current
+       node's ToolTip, if anything, and not Text.
+
        * RepeatLayout.cs: added two new members, UnorderedList and
        OrderedList (4.0)
 

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 6f375b69366cf25e502b31c9c0e58373962e12e9..3efa02b7d99df9e2eb0a3eb19928199256956dd5 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/TreeView.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/TreeView.cs
@@ -1521,7 +1521,11 @@ namespace System.Web.UI.WebControls
                        if (node.ShowCheckBoxInternal) {
                                writer.AddAttribute (HtmlTextWriterAttribute.Name, ClientID + "_cs_" + node.Path);
                                writer.AddAttribute (HtmlTextWriterAttribute.Type, "checkbox", false);
-#if !NET_4_0
+#if NET_4_0
+                               string str = node.ToolTip;
+                               if (!String.IsNullOrEmpty (str))
+                                       writer.AddAttribute (HtmlTextWriterAttribute.Title, str);
+#else
                                writer.AddAttribute (HtmlTextWriterAttribute.Title, node.Text);
 #endif
                                if (node.Checked)