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

Fix return value of wxList::insert() in non-STL builds.

Browse Source 
The returned value was the same as the iterator that was passed in which could
even be invalid when appending.

Fix the wrong use of postfix decrement instead of prefix one and handle the
case of appending correctly.

Closes #11808.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63943 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-04-12 00:36:36 +00:00
parent 89e1de6441
commit 8dd13d0fa1
2 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/lists/lists.cpp
View File

@@ -152,11 +152,20 @@ void ListsTestCase::wxStdListTest()
list1.clear();
CPPUNIT_ASSERT( list1.empty() );
list1.insert(list1.end(), (int *)1);
list1.insert(list1.end(), (int *)2);
it = list1.insert(list1.end(), (int *)1);
CPPUNIT_ASSERT_EQUAL( (int *)1, *it );
CPPUNIT_ASSERT( it == list1.begin() );
CPPUNIT_ASSERT_EQUAL( (int *)1, list1.front() );
it = list1.insert(list1.end(), (int *)2);
CPPUNIT_ASSERT_EQUAL( (int *)2, *it );
CPPUNIT_ASSERT( ++it == list1.end() );
CPPUNIT_ASSERT_EQUAL( (int *)2, list1.back() );
it = list1.begin();
wxListInt::iterator it2 = list1.insert(++it, (int *)3);
CPPUNIT_ASSERT_EQUAL( (int *)3, *it2 );
it = list1.begin();
it = list1.erase(++it, list1.end());
CPPUNIT_ASSERT_EQUAL( 1, list1.size() );