X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8703bc01c28e0397764cd28b915caf17a28020ad..09a65e631a6294643ba3d7453e3f82ada0da2fbe:/src/html/htmltag.cpp diff --git a/src/html/htmltag.cpp b/src/html/htmltag.cpp index 361aaa971a..1b9b7bd784 100644 --- a/src/html/htmltag.cpp +++ b/src/html/htmltag.cpp @@ -4,7 +4,7 @@ // Author: Vaclav Slavik // RCS-ID: $Id$ // Copyright: (c) 1999 Vaclav Slavik -// Licence: wxWindows Licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -90,7 +90,7 @@ wxHtmlTagsCache::wxHtmlTagsCache(const wxString& source) src[pos] != wxT('>') && !wxIsspace(src[pos]); i++, pos++ ) { - tagBuffer[i] = wxToupper(src[pos]); + tagBuffer[i] = (wxChar)wxToupper(src[pos]); } tagBuffer[i] = _T('\0'); @@ -127,7 +127,7 @@ wxHtmlTagsCache::wxHtmlTagsCache(const wxString& source) ++pos; if (src[pos] == '<') ++pos; - + // see if it matches int match_pos = 0; while (pos < lng && match_pos < tag_len && src[pos] != '>' && src[pos] != '<') { @@ -135,7 +135,7 @@ wxHtmlTagsCache::wxHtmlTagsCache(const wxString& source) // Unicode build if ((wxChar)wxToupper(src[pos]) == tagBuffer[match_pos]) { ++match_pos; - } + } else if (src[pos] == wxT(' ') || src[pos] == wxT('\n') || src[pos] == wxT('\r') || src[pos] == wxT('\t')) { // need to skip over these @@ -148,9 +148,7 @@ wxHtmlTagsCache::wxHtmlTagsCache(const wxString& source) // found a match if (match_pos == tag_len) { - // These 2 lines commented: - //pos = pos - tag_len - 3; pos is not used outside of while loop - //stpos = pos; Value is local to while loop, no need to set it + pos = pos - tag_len - 3; break; } else {