X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/081fcce3ba1647a7bf739a55a1432ebf3c676128..24e9f36bccb720dc7b8abd6187d9427fecbc75c9:/src/common/treebase.cpp

diff --git a/src/common/treebase.cpp b/src/common/treebase.cpp
index 4d9c1094e6..38d242bf06 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()));
     }
 
@@ -163,7 +169,12 @@ wxSize wxTreeCtrlBase::DoGetBestSize() const
     if ( !size.x || !size.y )
         size = wxControl::DoGetBestSize();
     else
+    {
+        // Add border size
+        size += GetWindowBorderSize();
+
         CacheBestSize(size);
+    }
 
     return size;
 }