X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fbf8436cb2886567a37e9efe6e28d4bda62d4b3e..69659fd770f615210efac4b4fa741b3ad6223616:/src/common/treebase.cpp?ds=sidebyside

diff --git a/src/common/treebase.cpp b/src/common/treebase.cpp
index e958ac733b..f10e2af927 100644
--- a/src/common/treebase.cpp
+++ b/src/common/treebase.cpp
@@ -113,6 +113,12 @@ wxGetBestTreeSize(const wxTreeCtrlBase* treeCtrl, wxTreeItemId id, wxSize& size)
 
     if ( treeCtrl->GetBoundingRect(id, rect, true /* just the item */) )
     {
+        // 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()));
     }
 
@@ -156,43 +162,30 @@ wxSize wxTreeCtrlBase::DoGetBestSize() const
     else // use precise, if potentially slow, size computation method
     {
         // iterate over all items recursively
-        wxGetBestTreeSize(this, GetRootItem(), size);
-
-        // but the above doesn't take into account the icon items nor the tree
-        // "+"/"-" buttons which have about the same size
-        wxCoord iconWidth, iconHeight;
-        if ( !m_imageListNormal ||
-                !m_imageListNormal->GetImageCount() ||
-                    !m_imageListNormal->GetSize(0, iconWidth, iconHeight) )
-        {
-            // FIXME: what is the default size of the tree buttons?
-            iconWidth =
-            iconHeight = 16;
-        }
-
-        // account for the icons if we have them
-        if ( m_imageListNormal )
-        {
-            // FIXME: and how to get the margin? better be large...
-            size.x += iconWidth + 10;
-        }
-
-        // and for the buttons always
-        if ( !HasFlag(wxTR_NO_BUTTONS) )
-            size.x += iconWidth;
+        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
+    {
+        // Add border size
+        size += GetWindowBorderSize();
+
         CacheBestSize(size);
+    }
 
     return size;
 }
 
 void wxTreeCtrlBase::ExpandAll()
 {
+    if ( IsEmpty() )
+        return;
+
     ExpandAllChildren(GetRootItem());
 }
 
@@ -212,5 +205,33 @@ void wxTreeCtrlBase::ExpandAllChildren(const wxTreeItemId& item)
     }
 }
 
+void wxTreeCtrlBase::CollapseAll()
+{
+    if ( IsEmpty() )
+        return;
+
+    CollapseAllChildren(GetRootItem());
+}
+
+void wxTreeCtrlBase::CollapseAllChildren(const wxTreeItemId& item)
+{
+    // 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);
+}
+
+bool wxTreeCtrlBase::IsEmpty() const
+{
+    return !GetRootItem().IsOk();
+}
+
 #endif // wxUSE_TREECTRL