X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e0272d05780ae2f150b6217fd20048a3e3d21c65..37b8e6798782278fdfe4f3c1291aaff55cdbb8c9:/src/common/tokenzr.cpp

diff --git a/src/common/tokenzr.cpp b/src/common/tokenzr.cpp
index c4f4bfb899..6b5d18e178 100644
--- a/src/common/tokenzr.cpp
+++ b/src/common/tokenzr.cpp
@@ -37,11 +37,11 @@ wxStringTokenizer::~wxStringTokenizer()
 
 off_t wxStringTokenizer::FindDelims(const wxString& str, const wxString& delims) const
 {
-    for ( int i = 0; i < str.Length(); i++ )
+    for ( size_t i = 0; i < str.Length(); i++ )
     {
-        char c = str[i];
+        wxChar c = str[i];
 
-        for ( int j = 0; j < delims.Length() ; j++ )
+        for ( size_t j = 0; j < delims.Length() ; j++ )
         {
             if ( delims[j] == c )
                 return i;
@@ -66,7 +66,7 @@ int wxStringTokenizer::CountTokens() const
         if (pos != -1)
         {
             count++;
-            p_string = p_string(0, pos);
+            p_string = p_string(pos+1, p_string.Length());
         }
         else
         {