Add entry for 2.8.0.1

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

diff --git a/src/common/treebase.cpp b/src/common/treebase.cpp
index 4eebd5fa094fa342a4f5a6e02a145a041b4f073e..08220fa5039f081efa02b59d24680e4669a3fb26 100644 (file)
--- a/src/common/treebase.cpp
+++ b/src/common/treebase.cpp
@@ -114,8 +114,10 @@ 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 ( 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);
         rect.x += treeCtrl->GetScrollPos(wxHORIZONTAL);
         rect.y += treeCtrl->GetScrollPos(wxVERTICAL);

+#endif

 
         size.IncTo(wxSize(rect.GetRight(), rect.GetBottom()));
     }
 
         size.IncTo(wxSize(rect.GetRight(), rect.GetBottom()));
     }


@@ -160,7 +162,9 @@ wxSize wxTreeCtrlBase::DoGetBestSize() const
     else // use precise, if potentially slow, size computation method
     {
         // iterate over all items recursively
     else // use precise, if potentially slow, size computation method
     {
         // iterate over all items recursively

-        wxGetBestTreeSize(this, GetRootItem(), size);
+        wxTreeItemId idRoot = GetRootItem();
+        if ( idRoot.IsOk() )
+            wxGetBestTreeSize(this, idRoot, size);

     }
 
     // need some minimal size even for empty tree
     }
 
     // need some minimal size even for empty tree