Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete child items in wxTreeCtrl::Delete under wxQT

Browse Source
This commit is contained in:
Graham Dawes
2019-02-11 08:14:25 +00:00
parent 6482664955
commit 5d2663432e
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/qt/treectrl.cpp
View File

@@ -977,6 +977,8 @@ void wxTreeCtrl::Delete(const wxTreeItemId& item)
QTreeWidgetItem *qTreeItem = wxQtConvertTreeItem(item); QTreeWidgetItem *qTreeItem = wxQtConvertTreeItem(item);
QTreeWidgetItem *parent = qTreeItem->parent(); QTreeWidgetItem *parent = qTreeItem->parent();
DeleteChildren(qTreeItem);
if ( parent != NULL ) if ( parent != NULL )
{ {
parent->removeChild(qTreeItem); parent->removeChild(qTreeItem);

3
tests/controls/treectrltest.cpp
View File

@@ -279,9 +279,10 @@ void TreeCtrlTestCase::DeleteItem()
EventCounter deleteitem(m_tree, wxEVT_TREE_DELETE_ITEM); EventCounter deleteitem(m_tree, wxEVT_TREE_DELETE_ITEM);
wxTreeItemId todelete = m_tree->AppendItem(m_root, "deleteme"); wxTreeItemId todelete = m_tree->AppendItem(m_root, "deleteme");
m_tree->AppendItem(todelete, "deleteme2");
m_tree->Delete(todelete); m_tree->Delete(todelete);
CPPUNIT_ASSERT_EQUAL(1, deleteitem.GetCount()); CPPUNIT_ASSERT_EQUAL(2, deleteitem.GetCount());
} }
void TreeCtrlTestCase::DeleteChildren() void TreeCtrlTestCase::DeleteChildren()