cleaning up common OSX code

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

diff --git a/src/common/treebase.cpp b/src/common/treebase.cpp
index bf992729d44a2538fef190dc122a63b8fbfd3770..4bd01ace539a11f47635039602ed18495b2225c6 100644 (file)
--- a/src/common/treebase.cpp
+++ b/src/common/treebase.cpp
@@ -106,16 +106,20 @@ wxTreeCtrlBase::~wxTreeCtrlBase()
         delete m_imageListState;
 }
 
         delete m_imageListState;
 }
 

-static void wxGetBestTreeSize(const wxTreeCtrlBase* treeCtrl, const wxTreeItemId& id, wxSize& size)
+static void
+wxGetBestTreeSize(const wxTreeCtrlBase* treeCtrl, wxTreeItemId id, wxSize& size)

 {
     wxRect rect;
 
 {
     wxRect rect;
 

-    if ( treeCtrl->GetBoundingRect(id, rect, true) )
+    if ( treeCtrl->GetBoundingRect(id, rect, true /* just the item */) )

     {
     {

-        if ( size.x < rect.x + rect.width )
-            size.x = rect.x + rect.width;
-        if ( size.y < rect.y + rect.height )
-            size.y = rect.y + rect.height;
+        // Translate to logical position so we get the full extent
+#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
+        rect.x += treeCtrl->GetScrollPos(wxHORIZONTAL);
+        rect.y += treeCtrl->GetScrollPos(wxVERTICAL);
+#endif
+
+        size.IncTo(wxSize(rect.GetRight(), rect.GetBottom()));

     }
 
     wxTreeItemIdValue cookie;
     }
 
     wxTreeItemIdValue cookie;


@@ -155,28 +159,44 @@ wxSize wxTreeCtrlBase::DoGetBestSize() const
             }
         }
     }
             }
         }
     }

-    else
-        wxGetBestTreeSize(this, GetRootItem(), size);
+    else // use precise, if potentially slow, size computation method
+    {
+        // iterate over all items recursively
+        wxTreeItemId idRoot = GetRootItem();
+        if ( idRoot.IsOk() )
+            wxGetBestTreeSize(this, idRoot, size);
+    }

 
     // need some minimal size even for empty tree
     if ( !size.x || !size.y )
         size = wxControl::DoGetBestSize();
     else
 
     // need some minimal size even for empty tree
     if ( !size.x || !size.y )
         size = wxControl::DoGetBestSize();
     else

+    {
+        // Add border size
+        size += GetWindowBorderSize();
+

         CacheBestSize(size);
         CacheBestSize(size);

+    }

 
     return size;
 }
 
 void wxTreeCtrlBase::ExpandAll()
 {
 
     return size;
 }
 
 void wxTreeCtrlBase::ExpandAll()
 {

+    if ( IsEmpty() )
+        return;
+

     ExpandAllChildren(GetRootItem());
 }
 
 void wxTreeCtrlBase::ExpandAllChildren(const wxTreeItemId& item)
 {
     ExpandAllChildren(GetRootItem());
 }
 
 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;


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

+    Thaw();
+}
+
+void wxTreeCtrlBase::CollapseAll()
+{
+    if ( IsEmpty() )
+        return;
+
+    CollapseAllChildren(GetRootItem());
+}
+
+void wxTreeCtrlBase::CollapseAllChildren(const wxTreeItemId& item)
+{
+    Freeze();
+    // first (recursively) collapse all the children
+    wxTreeItemIdValue cookie;
+    for ( wxTreeItemId idCurr = GetFirstChild(item, cookie);
+          idCurr.IsOk();
+          idCurr = GetNextChild(item, cookie) )
+    {
+        CollapseAllChildren(idCurr);
+    }
+
+    // then collapse this element too
+    Collapse(item);
+    Thaw();
+}
+
+bool wxTreeCtrlBase::IsEmpty() const
+{
+    return !GetRootItem().IsOk();

 }
 
 #endif // wxUSE_TREECTRL
 }
 
 #endif // wxUSE_TREECTRL