fixed incorrectly inversed test for parent [not] being deleted (patch 1624472)

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

diff --git a/src/common/treebase.cpp b/src/common/treebase.cpp
index 7b42fdd35ed71e61c7dad5d4b2ec9332e9fb47c4..08220fa5039f081efa02b59d24680e4669a3fb26 100644 (file)
--- a/src/common/treebase.cpp
+++ b/src/common/treebase.cpp
@@ -59,9 +59,23 @@ DEFINE_EVENT_TYPE(wxEVT_COMMAND_TREE_ITEM_MENU)
 // Tree event
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxTreeEvent, wxNotifyEvent)
+IMPLEMENT_ABSTRACT_CLASS(wxTreeEvent, wxNotifyEvent)
 
 
+wxTreeEvent::wxTreeEvent(wxEventType commandType,
+                         wxTreeCtrlBase *tree,
+                         const wxTreeItemId& item)
+           : wxNotifyEvent(commandType, tree->GetId()),
+             m_item(item)
+{
+    m_editCancelled = false;
+
+    SetEventObject(tree);
+
+    if ( item.IsOk() )
+        SetClientObject(tree->GetItemData(item));
+}
+
 wxTreeEvent::wxTreeEvent(wxEventType commandType, int id)
            : wxNotifyEvent(commandType, id)
 {
@@ -92,6 +106,31 @@ wxTreeCtrlBase::~wxTreeCtrlBase()
         delete m_imageListState;
 }
 
+static void
+wxGetBestTreeSize(const wxTreeCtrlBase* treeCtrl, wxTreeItemId id, wxSize& size)
+{
+    wxRect rect;
+
+    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()));
+    }
+
+    wxTreeItemIdValue cookie;
+    for ( wxTreeItemId item = treeCtrl->GetFirstChild(id, cookie);
+          item.IsOk();
+          item = treeCtrl->GetNextChild(id, cookie) )
+    {
+        wxGetBestTreeSize(treeCtrl, item, size);
+    }
+}
+
 wxSize wxTreeCtrlBase::DoGetBestSize() const
 {
     wxSize size;
@@ -99,30 +138,69 @@ wxSize wxTreeCtrlBase::DoGetBestSize() const
     // this doesn't really compute the total bounding rectangle of all items
     // but a not too bad guess of it which has the advantage of not having to
     // examine all (potentially hundreds or thousands) items in the control
-    for ( wxTreeItemId item = GetRootItem();
-          item.IsOk();
-          item = GetLastChild(item) )
-    {
-        wxRect rect;
 
-        // last parameter is "true" to get only the dimensions of the text
-        // label, we don't want to get the entire item width as it's determined
-        // by the current size
-        if ( GetBoundingRect(item, rect, true) )
+    if (GetQuickBestSize())
+    {
+        for ( wxTreeItemId item = GetRootItem();
+              item.IsOk();
+              item = GetLastChild(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;
+            wxRect rect;
+
+            // last parameter is "true" to get only the dimensions of the text
+            // label, we don't want to get the entire item width as it's determined
+            // by the current size
+            if ( GetBoundingRect(item, rect, true) )
+            {
+                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;
+            }
         }
     }
+    else // use precise, if potentially slow, size computation method
+    {
+        // iterate over all items recursively
+        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
+    {
+        // Add border size
+        size += GetWindowBorderSize();
+
+        CacheBestSize(size);
+    }
 
     return size;
 }
 
+void wxTreeCtrlBase::ExpandAll()
+{
+    ExpandAllChildren(GetRootItem());
+}
+
+void wxTreeCtrlBase::ExpandAllChildren(const wxTreeItemId& item)
+{
+    // expand this item first, this might result in its children being added on
+    // the fly
+    Expand(item);
+
+    // then (recursively) expand all the children
+    wxTreeItemIdValue cookie;
+    for ( wxTreeItemId idCurr = GetFirstChild(item, cookie);
+          idCurr.IsOk();
+          idCurr = GetNextChild(item, cookie) )
+    {
+        ExpandAllChildren(idCurr);
+    }
+}
+
 #endif // wxUSE_TREECTRL