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
This commit is contained in:
@@ -260,10 +260,11 @@ wxString wxStringTokenizer::GetNextToken()
|
|||||||
{
|
{
|
||||||
// in wxTOKEN_RET_DELIMS mode we return the delimiter character
|
// in wxTOKEN_RET_DELIMS mode we return the delimiter character
|
||||||
// with token, otherwise leave it out
|
// 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
|
// skip the token and the trailing delimiter
|
||||||
m_pos = pos + 1;
|
m_pos = pos + 1;
|
||||||
|
Reference in New Issue
Block a user