From 2f21b2be1be5d7f0e77f08635962eca3fad75f8b Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Mon, 19 Jan 2009 11:53:34 +0000 Subject: [PATCH] Forgot DeleteChildren() git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58223 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/datavcmn.cpp | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp index 2ef7b821fd..a850b9397f 100644 --- a/src/common/datavcmn.cpp +++ b/src/common/datavcmn.cpp @@ -1803,18 +1803,7 @@ void wxDataViewTreeStore::DeleteChildren( const wxDataViewItem& item ) wxDataViewTreeStoreContainerNode *node = FindContainerNode( item ); if (!node) return; - wxDataViewItemArray array; - wxDataViewTreeStoreNodeList::iterator iter; - for (iter = node->GetChildren().begin(); iter != node->GetChildren().end(); iter++) - { - wxDataViewTreeStoreNode* child = *iter; - array.Add( child->GetItem() ); - } - node->GetChildren().clear(); - - // notify control - ItemsDeleted( item, array ); } void wxDataViewTreeStore::DeleteAllItems() @@ -2134,7 +2123,21 @@ void wxDataViewTreeCtrl::DeleteItem( const wxDataViewItem& item ) void wxDataViewTreeCtrl::DeleteChildren( const wxDataViewItem& item ) { - GetStore()->DeleteChildren(item); + wxDataViewTreeStoreContainerNode *node = GetStore()->FindContainerNode( item ); + if (!node) return; + + wxDataViewItemArray array; + wxDataViewTreeStoreNodeList::iterator iter; + for (iter = node->GetChildren().begin(); iter != node->GetChildren().end(); iter++) + { + wxDataViewTreeStoreNode* child = *iter; + array.Add( child->GetItem() ); + } + + GetStore()->DeleteChildren( item ); + + // notify control + GetStore()->ItemsDeleted( item, array ); } void wxDataViewTreeCtrl::DeleteAllItems() -- 2.47.2