copy setup.h from setup0.h

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

diff --git a/src/common/treebase.cpp b/src/common/treebase.cpp
index 798ed50d4720790ef77231266526db0af6685ce1..38d242bf063267c577be5b432f2fea0ef96c50a6 100644 (file)
--- a/src/common/treebase.cpp
+++ b/src/common/treebase.cpp
@@ -106,22 +106,26 @@ 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;
     for ( wxTreeItemId item = treeCtrl->GetFirstChild(id, cookie);
           item.IsOk();
     }
 
     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);
     }
     {
         wxGetBestTreeSize(treeCtrl, item, size);
     }


@@ -155,14 +159,22 @@ wxSize wxTreeCtrlBase::DoGetBestSize() const
             }
         }
     }
             }
         }
     }

-    else
+    else // use precise, if potentially slow, size computation method
+    {
+        // iterate over all items recursively

         wxGetBestTreeSize(this, GetRootItem(), size);
         wxGetBestTreeSize(this, GetRootItem(), 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;
 }
 
     return size;
 }