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

fixed wxString::Replace() to work directly on m_impl -- matters for UTF-8 build

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53264 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2008-04-19 11:18:28 +00:00
parent 9827cf350f
commit f81cf71f9b
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/string.cpp
View File

@@ -1239,17 +1239,17 @@ size_t wxString::Replace(const wxString& strOld,
size_t uiCount = 0; // count of replacements made size_t uiCount = 0; // count of replacements made
size_t uiOldLen = strOld.length(); const size_t uiOldLen = strOld.m_impl.length();
size_t uiNewLen = strNew.length(); const size_t uiNewLen = strNew.m_impl.length();
for ( size_t dwPos = 0; dwPos < length(); ) for ( size_t dwPos = 0; dwPos < m_impl.length(); )
{ {
dwPos = find(strOld, dwPos); dwPos = m_impl.find(strOld.m_impl, dwPos);
if ( dwPos == npos ) if ( dwPos == npos )
break; break;
// 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, strNew, uiNewLen); m_impl.replace(dwPos, uiOldLen, strNew.m_impl);
// move up pos past the string that was replaced // move up pos past the string that was replaced
dwPos += uiNewLen; dwPos += uiNewLen;