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

fix wxString::Replace when new strings are longer than old string

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33494 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ryan Norton
2005-04-11 09:05:40 +00:00
parent ea38ef4b5c
commit 2df0258e2b
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/string.cpp
View File

@@ -1551,8 +1551,8 @@ size_t wxString::Replace(const wxChar *szOld,
//replace this occurance of the old string with the new one //replace this occurance of the old string with the new one
replace(dwPos, uiOldLen, szNew, uiNewLen); replace(dwPos, uiOldLen, szNew, uiNewLen);
//move up pos past the old string //move up pos past the string that was replaced
dwPos += uiOldLen; dwPos += uiNewLen;
//increase replace count //increase replace count
++uiCount; ++uiCount;

4
tests/strings/strings.cpp
View File

@@ -476,8 +476,8 @@ void StringTestCase::Replace()
CPPUNIT_ASSERT( s == wxString(r,rlen) ); \ CPPUNIT_ASSERT( s == wxString(r,rlen) ); \
} }
TEST_WXREPLACE( _T("null\0char"), 9, _T("c"), _T("d"), true, TEST_WXREPLACE( _T("null\0char"), 9, _T("c"), _T("de"), true,
_T("null\0dhar"), 9 ); _T("null\0dehar"), 10 );
#undef TEST_WXREPLACE #undef TEST_WXREPLACE
#undef TEST_NULLCHARREPLACE #undef TEST_NULLCHARREPLACE