Rework the wxCusor ctor taking wx stock number to provide as many cursors as

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

diff --git a/src/common/tokenzr.cpp b/src/common/tokenzr.cpp
index f69e8e6a73f8a7a6d86e0db770db71a7023fbe12..ea615aaf5781311e978135ccd306aa927cf428de 100644 (file)
--- a/src/common/tokenzr.cpp
+++ b/src/common/tokenzr.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        tokenzr.cpp
+// Name:        src/common/tokenzr.cpp
 // Purpose:     String tokenizer
 // Author:      Guilhem Lavaux
 // Modified by: Vadim Zeitlin (almost full rewrite)
@@ -25,7 +25,11 @@
 #endif
 
 #include "wx/tokenzr.h"
-#include "wx/arrstr.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/arrstr.h"
+    #include "wx/crt.h"
+#endif
 
 // Required for wxIs... functions
 #include <ctype.h>
@@ -55,14 +59,14 @@ void wxStringTokenizer::SetString(const wxString& str,
         // whitespace characters and as wxTOKEN_RET_EMPTY otherwise (for
         // whitespace delimiters, strtok() behaviour is better because we want
         // to count consecutive spaces as one delimiter)
-        const wxChar *p;
-        for ( p = delims.c_str(); *p; p++ )
+        wxString::const_iterator p;
+        for ( p = delims.begin(); p != delims.end(); ++p )
         {
             if ( !wxIsspace(*p) )
                 break;
         }
 
-        if ( *p )
+        if ( p != delims.end() )
         {
             // not whitespace char in delims
             mode = wxTOKEN_RET_EMPTY;