Unicode compilation fix for find_*_of()

(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

diff --git a/src/common/string.cpp b/src/common/string.cpp
index c866ca458992f63a8b98544d29cf87f8e6b6f1ae..37f88471720d8b8aabe8df7b1ed639ef05115a33 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -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) )
             return p - c_str();
     {
         if ( wxStrchr(sz, *p) )
             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 )
         return npos;
     else
     if ( nAccept >= length() - nStart )
         return npos;
     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 )
             return p - c_str();
     {
         if ( *p != ch )
             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) )
             return p - c_str();
     {
         if ( !wxStrchr(sz, *p) )
             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 )
             return p - c_str();
     {
         if ( *p != ch )
             return p - c_str();