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

made wxString::Replace, Matches and Find work with any form of string argument

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45249 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-04-05 08:35:39 +00:00
parent 54429bb380
commit 8a540c887c
3 changed files with 53 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/common/string.cpp
View File

@@ -941,32 +941,32 @@ wxString wxString::AfterFirst(wxUniChar ch) const
}
// replace first (or all) occurences of some substring with another one
size_t wxString::Replace(const wxChar *szOld,
const wxChar *szNew, bool bReplaceAll)
size_t wxString::Replace(const wxString& strOld,
const wxString& strNew, bool bReplaceAll)
{
// if we tried to replace an empty string we'd enter an infinite loop below
wxCHECK_MSG( szOld && *szOld && szNew, 0,
wxCHECK_MSG( !strOld.empty(), 0,
_T("wxString::Replace(): invalid parameter") );
size_t uiCount = 0; // count of replacements made
size_t uiOldLen = wxStrlen(szOld);
size_t uiNewLen = wxStrlen(szNew);
size_t uiOldLen = strOld.length();
size_t uiNewLen = strNew.length();
size_t dwPos = 0;
while ( this->c_str()[dwPos] != wxT('\0') )
while ( (*this)[dwPos] != wxT('\0') )
{
//DO NOT USE STRSTR HERE
//this string can contain embedded null characters,
//so strstr will function incorrectly
dwPos = find(szOld, dwPos);
dwPos = find(strOld, dwPos);
if ( dwPos == npos )
break; // exit the loop
else
{
//replace this occurance of the old string with the new one
replace(dwPos, uiOldLen, szNew, uiNewLen);
replace(dwPos, uiOldLen, strNew, uiNewLen);
//move up pos past the string that was replaced
dwPos += uiNewLen;
@@ -1131,14 +1131,6 @@ int wxString::Find(wxUniChar ch, bool bFromEnd) const
return (idx == npos) ? wxNOT_FOUND : (int)idx;
}
// find a sub-string (like strstr)
int wxString::Find(const wxChar *pszSub) const
{
size_type idx = find(pszSub);
return (idx == npos) ? wxNOT_FOUND : (int)idx;
}
// ----------------------------------------------------------------------------
// conversion to numbers
// ----------------------------------------------------------------------------
@@ -1356,7 +1348,7 @@ int wxString::PrintfV(const wxString& format, va_list argptr)
// returns true if the string matches the pattern which may contain '*' and
// '?' metacharacters (as usual, '?' matches any character and '*' any number
// of them)
bool wxString::Matches(const wxChar *pszMask) const
bool wxString::Matches(const wxString& mask) const
{
// I disable this code as it doesn't seem to be faster (in fact, it seems
// to be much slower) than the old, hand-written code below and using it
@@ -1407,8 +1399,17 @@ bool wxString::Matches(const wxChar *pszMask) const
#else // !wxUSE_REGEX
// TODO: this is, of course, awfully inefficient...
// FIXME-UTF8: implement using iterators, remove #if
#if wxUSE_UNICODE_UTF8
wxWCharBuffer maskBuf = mask.wc_str();
wxWCharBuffer txtBuf = wc_str();
const wxChar *pszMask = maskBuf.data();
const wxChar *pszTxt = txtBuf.data();
#else
const wxChar *pszMask = mask.wx_str();
// the char currently being checked
const wxChar *pszTxt = c_str();
const wxChar *pszTxt = wx_str();
#endif
// the last location where '*' matched
const wxChar *pszLastStarInText = NULL;