From: Václav Slavík <vslavik@fastmail.fm>
Date: Sat, 11 Aug 2007 19:17:14 +0000 (+0000)
Subject: fixed wxStringTokenizer to correctly handle wxTOKEN_RET_DELIMS after the recent chang... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/f06a1f33f13bd2c33a94701ca38f1c0053bae3b7

fixed wxStringTokenizer to correctly handle wxTOKEN_RET_DELIMS after the recent change to use iterators

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48027 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/common/tokenzr.cpp b/src/common/tokenzr.cpp
index 12aa6c2e1d..8c29cd7cfa 100644
--- a/src/common/tokenzr.cpp
+++ b/src/common/tokenzr.cpp
@@ -260,10 +260,11 @@ wxString wxStringTokenizer::GetNextToken()
         {
             // in wxTOKEN_RET_DELIMS mode we return the delimiter character
             // with token, otherwise leave it out
+            wxString::const_iterator tokenEnd(pos);
             if ( m_mode == wxTOKEN_RET_DELIMS )
-                ++pos;
+                ++tokenEnd;
 
-            token.assign(m_pos, pos);
+            token.assign(m_pos, tokenEnd);
 
             // skip the token and the trailing delimiter
             m_pos = pos + 1;