* wxDataStreams use wxUint now.

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

diff --git a/src/common/tokenzr.cpp b/src/common/tokenzr.cpp
index c4f4bfb899ba68b87ed7f5afea0a2ebd082c1e0b..6b5d18e1782e9d1ffc391af338850937840a66ea 100644 (file)
--- 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
         {