2008-02-22 Jonathan Pobst <monkey@jpobst.com>

[Backport to 1.9] * TreeView.cs: Make selected_node and highlighted_node internal. * TreeNodeCollection.cs: Reset selected_node and highlighted_node to null when Nodes.Clear is called. [Fixes bug #363884] svn path=/branches/mono-1-9/mcs/; revision=97635
mono · Mar 6, 2008 · e80fe9e · e80fe9e
1 parent 689eabf
commit e80fe9e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
@@ -1,3 +1,10 @@
+2008-02-22  Jonathan Pobst  <monkey@jpobst.com>
+	[Backport to 1.9]
+	* TreeView.cs: Make selected_node and highlighted_node internal.
+	* TreeNodeCollection.cs: Reset selected_node and highlighted_node
+	to null when Nodes.Clear is called.
+	[Fixes bug #363884]
+
 2008-03-03  Ivan N. Zlatev  <contact@i-nz.net>
 
 	* GridEntry.cs: Do not convert not only if the types match, 

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeNodeCollection.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeNodeCollection.cs
@@ -208,6 +208,8 @@ public virtual void Clear ()
 			if (owner != null) {
 				tree_view = owner.TreeView;
 				if (tree_view != null) {
+					tree_view.highlighted_node = null;
+					tree_view.selected_node = null;
 					tree_view.UpdateBelow (owner);
 					tree_view.RecalculateVisibleOrder (owner);
 					tree_view.UpdateScrollBars (false);

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeView.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeView.cs
@@ -50,10 +50,10 @@ public class TreeView : Control {
 		private TreeNodeCollection nodes;
 
 		private TreeViewAction selection_action;
-		private TreeNode selected_node;
+		internal TreeNode selected_node;
 		private TreeNode pre_selected_node;
 		private TreeNode focused_node;
-		private TreeNode highlighted_node;
+		internal TreeNode highlighted_node;
 		private Rectangle mouse_rect;
 		private bool select_mmove;