From: Vadim Zeitlin Date: Wed, 23 May 2012 21:16:35 +0000 (+0000) Subject: Compilation fix for wxUSE_STL && !wxUSE_STL_BASED_WXSTRING build. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/da94537c646dc63238dbadf0db004ac938293d65?ds=sidebyside Compilation fix for wxUSE_STL && !wxUSE_STL_BASED_WXSTRING build. Don't rely on implicit wxString to "const char*" conversion in Replace(). Closes #14327. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71543 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/common/string.cpp b/src/common/string.cpp index 4798b67c9c..3dea38ec67 100644 --- a/src/common/string.cpp +++ b/src/common/string.cpp @@ -1436,7 +1436,7 @@ size_t wxString::Replace(const wxString& strOld, } else if ( !bReplaceAll) { - size_t pos = m_impl.find(strOld, 0); + size_t pos = m_impl.find(strOld.m_impl, 0); if ( pos != npos ) { m_impl.replace(pos, strOld.m_impl.length(), strNew.m_impl);