fix compilation when one of wxUSE_LISTCTRL and wxUSE_TREECTRL is defined but the...

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

diff --git a/src/common/treebase.cpp b/src/common/treebase.cpp
index e38866e7d14bd7714221b68416950ee11e7e2889..4d9c1094e61039d954798d7e18a8cce744940b3e 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
 // ----------------------------------------------------------------------------
 
 // 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)
 {
 wxTreeEvent::wxTreeEvent(wxEventType commandType, int id)
            : wxNotifyEvent(commandType, id)
 {


@@ -92,22 +106,20 @@ 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;
+        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);
     }


@@ -120,7 +132,7 @@ 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
     // 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

-    
+

     if (GetQuickBestSize())
     {
         for ( wxTreeItemId item = GetRootItem();
     if (GetQuickBestSize())
     {
         for ( wxTreeItemId item = GetRootItem();


@@ -141,8 +153,11 @@ 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 )
 
     // need some minimal size even for empty tree
     if ( !size.x || !size.y )


@@ -153,5 +168,26 @@ wxSize wxTreeCtrlBase::DoGetBestSize() const
     return 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
 
 #endif // wxUSE_TREECTRL