Rework the wxCusor ctor taking wx stock number to provide as many cursors as

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

diff --git a/src/common/treebase.cpp b/src/common/treebase.cpp
index 4d9c1094e61039d954798d7e18a8cce744940b3e..f10e2af927b24c6b40ecdf0924b6bead4fb33566 100644 (file)
--- 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 */) )
     {
 
     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()));
     }
 
         size.IncTo(wxSize(rect.GetRight(), rect.GetBottom()));
     }
 


@@ -156,20 +162,30 @@ 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
     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;
 }
 
 void wxTreeCtrlBase::ExpandAll()
 {
 
     return size;
 }
 
 void wxTreeCtrlBase::ExpandAll()
 {

+    if ( IsEmpty() )
+        return;
+

     ExpandAllChildren(GetRootItem());
 }
 
     ExpandAllChildren(GetRootItem());
 }
 


@@ -189,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
 
 #endif // wxUSE_TREECTRL