From f81cf71f9b912e313f29a685957e0b4b5ee51813 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sat, 19 Apr 2008 11:18:28 +0000 Subject: [PATCH] fixed wxString::Replace() to work directly on m_impl -- matters for UTF-8 build git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53264 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/string.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/common/string.cpp b/src/common/string.cpp index e68c7f03c0..c3bc9331cb 100644 --- a/src/common/string.cpp +++ b/src/common/string.cpp @@ -1239,17 +1239,17 @@ size_t wxString::Replace(const wxString& strOld, size_t uiCount = 0; // count of replacements made - size_t uiOldLen = strOld.length(); - size_t uiNewLen = strNew.length(); + const size_t uiOldLen = strOld.m_impl.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 ) break; // 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 dwPos += uiNewLen; -- 2.45.2