From 555d0d7ef10ece4862658d47f076fb8631b1c7b6 Mon Sep 17 00:00:00 2001 From: Mattia Barbon Date: Tue, 26 Apr 2005 19:24:12 +0000 Subject: [PATCH] Correct wxArrayString::Add return value as per the documentation. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33888 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/arrstr.h | 6 ++++++ tests/arrays/arrays.cpp | 10 ++++++++++ 2 files changed, 16 insertions(+) diff --git a/include/wx/arrstr.h b/include/wx/arrstr.h index 70bddf1737..18d7651c4f 100644 --- a/include/wx/arrstr.h +++ b/include/wx/arrstr.h @@ -50,6 +50,12 @@ public: void Sort(bool reverseOrder = false); void Sort(CompareFunction 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 diff --git a/tests/arrays/arrays.cpp b/tests/arrays/arrays.cpp index 79c3b97f72..049fbf09ae 100644 --- a/tests/arrays/arrays.cpp +++ b/tests/arrays/arrays.cpp @@ -274,6 +274,16 @@ void ArraysTestCase::wxStringArrayTest() CPPUNIT_ASSERT( a1.Index( _T("condor") ) == 2 ); CPPUNIT_ASSERT( a1.Index( _T("thermit") ) == 3 ); 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()