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

Correct wxArrayString::Add return value as per the documentation.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33888 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2005-04-26 19:24:12 +00:00
parent 50807f9083
commit 555d0d7ef1
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/arrstr.h
View File

@@ -50,6 +50,12 @@ public:
void Sort(bool reverseOrder = false); void Sort(bool reverseOrder = false);
void Sort(CompareFunction function); void Sort(CompareFunction function);
void Sort(CMPFUNCwxString function) { wxArrayStringBase::Sort(function); } void Sort(CMPFUNCwxString function) { wxArrayStringBase::Sort(function); }
size_t Add(const wxString& string, size_t copies = 1)
{
wxArrayStringBase::Add(string, copies);
return size() - copies;
}
}; };
class WXDLLIMPEXP_BASE wxSortedArrayString : public wxSortedArrayStringBase class WXDLLIMPEXP_BASE wxSortedArrayString : public wxSortedArrayStringBase

10
tests/arrays/arrays.cpp
View File

@@ -274,6 +274,16 @@ void ArraysTestCase::wxStringArrayTest()
CPPUNIT_ASSERT( a1.Index( _T("condor") ) == 2 ); CPPUNIT_ASSERT( a1.Index( _T("condor") ) == 2 );
CPPUNIT_ASSERT( a1.Index( _T("thermit") ) == 3 ); CPPUNIT_ASSERT( a1.Index( _T("thermit") ) == 3 );
CPPUNIT_ASSERT( a1.Index( _T("alligator") ) == 4 ); CPPUNIT_ASSERT( a1.Index( _T("alligator") ) == 4 );
wxArrayString a5;
CPPUNIT_ASSERT( a5.Add( _T("x"), 1 ) == 0 );
CPPUNIT_ASSERT( a5.Add( _T("a"), 3 ) == 1 );
CPPUNIT_ASSERT( COMPARE_4_VALUES( a5, _T("x") ,
_T("a") ,
_T("a") ,
_T("a") ) );
} }
void ArraysTestCase::wxObjArrayTest() void ArraysTestCase::wxObjArrayTest()