X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d98a58c543948d84d9287e6fa53a5539d662b7a5..77c8efc8c37da6d6a5e2e8022d21d1cd7d76371d:/src/common/string.cpp diff --git a/src/common/string.cpp b/src/common/string.cpp index d92df7a08c..3dea38ec67 100644 --- a/src/common/string.cpp +++ b/src/common/string.cpp @@ -1169,12 +1169,6 @@ int wxString::CmpNoCase(const wxString& s) const #if wxUSE_UNICODE -#ifdef __MWERKS__ -#ifndef __SCHAR_MAX__ -#define __SCHAR_MAX__ 127 -#endif -#endif - wxString wxString::FromAscii(const char *ascii, size_t len) { if (!ascii || len == 0) @@ -1442,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);