fixed wxStringTokenizer to correctly handle wxTOKEN_RET_DELIMS after the recent chang...

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 12aa6c2e1d55956a1a4fe50ae135578d4396acf8..8c29cd7cfa6db0f59587f465ad50fd674e30bdf9 100644 (file)
--- 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
         {
             // 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 )
             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;
 
             // skip the token and the trailing delimiter
             m_pos = pos + 1;