X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7093413895ea0c67d895951d06f2dbece363f809..fd5199d66b704415f9debbf9df650b8267ee0099:/src/common/treebase.cpp

diff --git a/src/common/treebase.cpp b/src/common/treebase.cpp
index 798ed50d47..4d9c1094e6 100644
--- a/src/common/treebase.cpp
+++ b/src/common/treebase.cpp
@@ -106,22 +106,20 @@ wxTreeCtrlBase::~wxTreeCtrlBase()
         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;
 
-    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;
+        size.IncTo(wxSize(rect.GetRight(), rect.GetBottom()));
     }
 
     wxTreeItemIdValue cookie;
     for ( wxTreeItemId item = treeCtrl->GetFirstChild(id, cookie);
           item.IsOk();
-          item = treeCtrl->GetNextChild(item, cookie) )
+          item = treeCtrl->GetNextChild(id, cookie) )
     {
         wxGetBestTreeSize(treeCtrl, item, size);
     }
@@ -155,8 +153,11 @@ wxSize wxTreeCtrlBase::DoGetBestSize() const
             }
         }
     }
-    else
+    else // use precise, if potentially slow, size computation method
+    {
+        // iterate over all items recursively
         wxGetBestTreeSize(this, GetRootItem(), size);
+    }
 
     // need some minimal size even for empty tree
     if ( !size.x || !size.y )