Corrected bug in DoSetSize() (wxALLOW_MINUS_ONE)

[wxWidgets.git] / src / common / string.cpp

diff --git a/src/common/string.cpp b/src/common/string.cpp
index 3c3e2b6d1e939020ab24587fcf17784ab23eeb4b..89cc7772f16434d12412a599a36683650ae2af67 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -1451,8 +1451,8 @@ size_t wxString::rfind(wxChar ch, size_t nStart) const
 
 size_t wxString::find_first_of(const wxChar* sz, size_t nStart) const
 {
 
 size_t wxString::find_first_of(const wxChar* sz, size_t nStart) const
 {

-    const char *start = c_str() + nStart;
-    char *firstOf = strpbrk(start, sz);
+    const wxChar *start = c_str() + nStart;
+    const wxChar *firstOf = wxStrpbrk(start, sz);

     if ( firstOf )
         return firstOf - start;
     else
     if ( firstOf )
         return firstOf - start;
     else


@@ -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();


@@ -2128,7 +2128,7 @@ static void wxLoadCharacterSets(void)
   if (already_loaded) return;
 
   already_loaded = TRUE;
   if (already_loaded) return;
 
   already_loaded = TRUE;

-#if defined(__UNIX__)
+#if defined(__UNIX__) && wxUSE_TEXTFILE

   // search through files in /usr/share/i18n/charmaps
   wxString fname;
   for (fname = ::wxFindFirstFile(_T("/usr/share/i18n/charmaps/*"));
   // search through files in /usr/share/i18n/charmaps
   wxString fname;
   for (fname = ::wxFindFirstFile(_T("/usr/share/i18n/charmaps/*"));