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

Unicode compilation fix for find_*_of()

Browse Source 
(I might be back at work committing other fixes soon,
but probably not before tomorrow at least.)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2522 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ove Kaaven 1999-05-20 11:11:46 +00:00
parent 9145664b28
commit 2027288898
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/string.cpp
View File

@ -1470,7 +1470,7 @@ size_t wxString::find_last_of(const wxChar* sz, size_t nStart) const
wxASSERT( nStart <= Len() ); wxASSERT( nStart <= Len() );
} }
for ( const char *p = c_str() + length() - 1; p >= c_str(); p-- ) for ( const wxChar *p = c_str() + length() - 1; p >= c_str(); p-- )
{ {
if ( wxStrchr(sz, *p) ) if ( wxStrchr(sz, *p) )
return p - c_str(); return p - c_str();
@ -1490,7 +1490,7 @@ size_t wxString::find_first_not_of(const wxChar* sz, size_t nStart) const
wxASSERT( nStart <= Len() ); wxASSERT( nStart <= Len() );
} }
size_t nAccept = strspn(c_str() + nStart, sz); size_t nAccept = wxStrspn(c_str() + nStart, sz);
if ( nAccept >= length() - nStart ) if ( nAccept >= length() - nStart )
return npos; return npos;
else else
@ -1501,7 +1501,7 @@ size_t wxString::find_first_not_of(wxChar ch, size_t nStart) const
{ {
wxASSERT( nStart <= Len() ); wxASSERT( nStart <= Len() );
for ( const char *p = c_str() + nStart; *p; p++ ) for ( const wxChar *p = c_str() + nStart; *p; p++ )
{ {
if ( *p != ch ) if ( *p != ch )
return p - c_str(); return p - c_str();
@ -1521,7 +1521,7 @@ size_t wxString::find_last_not_of(const wxChar* sz, size_t nStart) const
wxASSERT( nStart <= Len() ); wxASSERT( nStart <= Len() );
} }
for ( const char *p = c_str() + nStart - 1; p >= c_str(); p-- ) for ( const wxChar *p = c_str() + nStart - 1; p >= c_str(); p-- )
{ {
if ( !wxStrchr(sz, *p) ) if ( !wxStrchr(sz, *p) )
return p - c_str(); return p - c_str();
@ -1541,7 +1541,7 @@ size_t wxString::find_last_not_of(wxChar ch, size_t nStart) const
wxASSERT( nStart <= Len() ); wxASSERT( nStart <= Len() );
} }
for ( const char *p = c_str() + nStart - 1; p >= c_str(); p-- ) for ( const wxChar *p = c_str() + nStart - 1; p >= c_str(); p-- )
{ {
if ( *p != ch ) if ( *p != ch )
return p - c_str(); return p - c_str();