cleaning up common OSX code

[wxWidgets.git] / src / common / treebase.cpp

diff --git a/src/common/treebase.cpp b/src/common/treebase.cpp
index f10e2af927b24c6b40ecdf0924b6bead4fb33566..4bd01ace539a11f47635039602ed18495b2225c6 100644 (file)
--- a/src/common/treebase.cpp
+++ b/src/common/treebase.cpp
@@ -191,9 +191,12 @@ void wxTreeCtrlBase::ExpandAll()
 
 void wxTreeCtrlBase::ExpandAllChildren(const wxTreeItemId& item)
 {
 
 void wxTreeCtrlBase::ExpandAllChildren(const wxTreeItemId& item)
 {

+    Freeze();

     // expand this item first, this might result in its children being added on
     // the fly
     // expand this item first, this might result in its children being added on
     // the fly

-    Expand(item);
+    if ( item != GetRootItem() || !HasFlag(wxTR_HIDE_ROOT) )
+        Expand(item);
+    //else: expanding hidden root item is unsupported and unnecessary

 
     // then (recursively) expand all the children
     wxTreeItemIdValue cookie;
 
     // then (recursively) expand all the children
     wxTreeItemIdValue cookie;


@@ -203,6 +206,7 @@ void wxTreeCtrlBase::ExpandAllChildren(const wxTreeItemId& item)
     {
         ExpandAllChildren(idCurr);
     }
     {
         ExpandAllChildren(idCurr);
     }

+    Thaw();

 }
 
 void wxTreeCtrlBase::CollapseAll()
 }
 
 void wxTreeCtrlBase::CollapseAll()


@@ -215,6 +219,7 @@ void wxTreeCtrlBase::CollapseAll()
 
 void wxTreeCtrlBase::CollapseAllChildren(const wxTreeItemId& item)
 {
 
 void wxTreeCtrlBase::CollapseAllChildren(const wxTreeItemId& item)
 {

+    Freeze();

     // first (recursively) collapse all the children
     wxTreeItemIdValue cookie;
     for ( wxTreeItemId idCurr = GetFirstChild(item, cookie);
     // first (recursively) collapse all the children
     wxTreeItemIdValue cookie;
     for ( wxTreeItemId idCurr = GetFirstChild(item, cookie);


@@ -226,6 +231,7 @@ void wxTreeCtrlBase::CollapseAllChildren(const wxTreeItemId& item)
 
     // then collapse this element too
     Collapse(item);
 
     // then collapse this element too
     Collapse(item);

+    Thaw();

 }
 
 bool wxTreeCtrlBase::IsEmpty() const
 }
 
 bool wxTreeCtrlBase::IsEmpty() const