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

Handle multiple item insertion and deletion in wxSelectionStore.

Browse Source 
Rename the existing but not implemented and never used OnItemAdd() method to
OnItemsInserted() and add OnItemsDeleted(), which is more efficient than
OnItemDelete() when many items are being removed from the control at once.

This is not used yet, but will be used in wxDataViewCtrl soon and maybe in the
other controls later.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77904 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-09-27 20:46:21 +00:00
parent 06ab4da3f3
commit adf8f9d0cd
3 changed files with 101 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
tests/misc/selstoretest.cpp
View File

@@ -46,6 +46,7 @@ private:
CPPUNIT_TEST( SetItemCount );
CPPUNIT_TEST( Clear );
CPPUNIT_TEST( Iterate );
CPPUNIT_TEST( ItemsAddDelete );
CPPUNIT_TEST_SUITE_END();
void SelectItem();
@@ -53,6 +54,7 @@ private:
void SetItemCount();
void Clear();
void Iterate();
void ItemsAddDelete();
// NB: must be even
static const unsigned NUM_ITEMS;
@@ -154,3 +156,34 @@ void SelStoreTestCase::Iterate()
m_store->SelectItem(0, false);
CPPUNIT_ASSERT_EQUAL(1, m_store->GetFirstSelectedItem(cookie));
}
void SelStoreTestCase::ItemsAddDelete()
{
m_store->SelectItem(0);
m_store->SelectItem(NUM_ITEMS/2);
m_store->SelectItem(NUM_ITEMS - 1);
m_store->OnItemsInserted(NUM_ITEMS/2 + 1, 1);
CPPUNIT_ASSERT(m_store->IsSelected(0));
CPPUNIT_ASSERT(m_store->IsSelected(NUM_ITEMS/2));
CPPUNIT_ASSERT(m_store->IsSelected(NUM_ITEMS));
CPPUNIT_ASSERT_EQUAL(3, m_store->GetSelectedCount());
CPPUNIT_ASSERT(m_store->OnItemsDeleted(NUM_ITEMS/2 - 1, 2));
CPPUNIT_ASSERT(m_store->IsSelected(0));
CPPUNIT_ASSERT(m_store->IsSelected(NUM_ITEMS - 2));
CPPUNIT_ASSERT_EQUAL(2, m_store->GetSelectedCount());
m_store->OnItemsInserted(0, 2);
CPPUNIT_ASSERT(m_store->IsSelected(2));
CPPUNIT_ASSERT(m_store->IsSelected(NUM_ITEMS));
CPPUNIT_ASSERT_EQUAL(2, m_store->GetSelectedCount());
m_store->OnItemDelete(0);
m_store->SelectRange(0, NUM_ITEMS - 1);
CPPUNIT_ASSERT(m_store->OnItemsDeleted(0, NUM_ITEMS/2));
CPPUNIT_ASSERT_EQUAL(NUM_ITEMS/2, m_store->GetSelectedCount());
CPPUNIT_ASSERT(m_store->IsSelected(0));
CPPUNIT_ASSERT(m_store->IsSelected(NUM_ITEMS/2));
}