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

Merge branch 'treectrl-delete-events'

Browse Source 
See https://github.com/wxWidgets/wxWidgets/pull/881
This commit is contained in:
Vadim Zeitlin
2018-08-18 15:07:37 +02:00
parent fc324fd9bf 3c8b9589d8
commit 48da21619e
2 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
interface/wx/treectrl.h
View File

@@ -310,15 +310,19 @@ public:
virtual void Delete(const wxTreeItemId& item); virtual void Delete(const wxTreeItemId& item);
/** /**
Deletes all items in the control. Note that this may not generate Deletes all items in the control.
@c EVT_TREE_DELETE_ITEM events under some Windows versions although
normally such event is generated for each removed item. This function generates @c wxEVT_TREE_DELETE_ITEM events for each item
being deleted, including the root one if it is shown, i.e. unless
wxTR_HIDE_ROOT style is used.
*/ */
virtual void DeleteAllItems(); virtual void DeleteAllItems();
/** /**
Deletes all children of the given item (but not the item itself). Note Deletes all children of the given item (but not the item itself).
that this will @b not generate any events unlike Delete() method.
A @c wxEVT_TREE_DELETE_ITEM event will be generated for every item
being deleted.
If you have called SetItemHasChildren(), you may need to call it again If you have called SetItemHasChildren(), you may need to call it again
since DeleteChildren() does not automatically clear the setting. since DeleteChildren() does not automatically clear the setting.

25
tests/controls/treectrltest.cpp
View File

@@ -45,6 +45,8 @@ private:
CPPUNIT_TEST_SUITE( TreeCtrlTestCase ); CPPUNIT_TEST_SUITE( TreeCtrlTestCase );
WXUISIM_TEST( ItemClick ); WXUISIM_TEST( ItemClick );
CPPUNIT_TEST( DeleteItem ); CPPUNIT_TEST( DeleteItem );
CPPUNIT_TEST( DeleteChildren );
CPPUNIT_TEST( DeleteAllItems );
WXUISIM_TEST( LabelEdit ); WXUISIM_TEST( LabelEdit );
WXUISIM_TEST( KeyDown ); WXUISIM_TEST( KeyDown );
#ifndef __WXGTK__ #ifndef __WXGTK__
@@ -72,6 +74,8 @@ private:
void ItemClick(); void ItemClick();
void DeleteItem(); void DeleteItem();
void DeleteChildren();
void DeleteAllItems();
void LabelEdit(); void LabelEdit();
void KeyDown(); void KeyDown();
#ifndef __WXGTK__ #ifndef __WXGTK__
@@ -269,12 +273,29 @@ void TreeCtrlTestCase::DeleteItem()
wxTreeItemId todelete = m_tree->AppendItem(m_root, "deleteme"); wxTreeItemId todelete = m_tree->AppendItem(m_root, "deleteme");
m_tree->Delete(todelete); m_tree->Delete(todelete);
// We do not test DeleteAllItems() as under some versions of Windows events
// are not generated.
CPPUNIT_ASSERT_EQUAL(1, deleteitem.GetCount()); CPPUNIT_ASSERT_EQUAL(1, deleteitem.GetCount());
} }
void TreeCtrlTestCase::DeleteChildren()
{
EventCounter deletechildren(m_tree, wxEVT_TREE_DELETE_ITEM);
m_tree->AppendItem(m_child1, "another grandchild");
m_tree->DeleteChildren(m_child1);
CHECK( deletechildren.GetCount() == 2 );
}
void TreeCtrlTestCase::DeleteAllItems()
{
EventCounter deleteall(m_tree, wxEVT_TREE_DELETE_ITEM);
m_tree->DeleteAllItems();
CHECK( deleteall.GetCount() == 4 );
}
#if wxUSE_UIACTIONSIMULATOR #if wxUSE_UIACTIONSIMULATOR
void TreeCtrlTestCase::LabelEdit() void TreeCtrlTestCase::LabelEdit()