Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use iterators instead of indices in wxStripMenuCodes().

Browse Source 
Make the function more efficient when using UTF-8 wxStrings by using iterators
instead of indices in the loop searching for "&".

Closes #14307.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71434 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-05-15 10:03:53 +00:00
parent 3ef12fd203
commit c833f0cdb0
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/utilscmn.cpp
View File

@@ -1184,22 +1184,22 @@ wxString wxStripMenuCodes(const wxString& in, int flags)
size_t len = in.length(); size_t len = in.length();
out.reserve(len); out.reserve(len);
for ( size_t n = 0; n < len; n++ ) for ( wxString::const_iterator it = in.begin(); it != in.end(); ++it )
{ {
wxChar ch = in[n]; wxChar ch = *it;
if ( (flags & wxStrip_Mnemonics) && ch == wxT('&') ) if ( (flags & wxStrip_Mnemonics) && ch == wxT('&') )
{ {
// skip it, it is used to introduce the accel char (or to quote // skip it, it is used to introduce the accel char (or to quote
// itself in which case it should still be skipped): note that it // itself in which case it should still be skipped): note that it
// can't be the last character of the string // can't be the last character of the string
if ( ++n == len ) if ( ++it == in.end() )
{ {
wxLogDebug(wxT("Invalid menu string '%s'"), in.c_str()); wxLogDebug(wxT("Invalid menu string '%s'"), in.c_str());
} }
else else
{ {
// use the next char instead // use the next char instead
ch = in[n]; ch = *it;
} }
} }
else if ( (flags & wxStrip_Accel) && ch == wxT('\t') ) else if ( (flags & wxStrip_Accel) && ch == wxT('\t') )