diff options
| author | Jonathan Pobst <monkey@jpobst.com> | 2008-03-07 00:58:25 +0300 |
|---|---|---|
| committer | Jonathan Pobst <monkey@jpobst.com> | 2008-03-07 00:58:25 +0300 |
| commit | e80fe9efc2b64aacf06657cc8951c9739513069d (patch) | |
| tree | 8d8b30de52a47810442f33c238cad2e3c64b54e5 | |
| parent | 689eabf6e70779424132ee476ab4cef3c73b2a90 (diff) | |
2008-02-22 Jonathan Pobst <monkey@jpobst.com>mono-1.9
[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
3 files changed, 11 insertions, 2 deletions
diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog index bc96ae41a98..90861b956e0 100644 --- 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 index 47b99399b9f..b7f74d6439e 100644 --- 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 @@ namespace System.Windows.Forms { 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 index 8267d7ab241..d18f33cd19d 100644 --- 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 @@ namespace System.Windows.Forms { 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; |