X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/69941f05864fa8b37856ccc1338124bfac756a2b..e22da5d62588dd7c928d1aaa1f1dfeb797792f2f:/src/html/htmlpars.cpp diff --git a/src/html/htmlpars.cpp b/src/html/htmlpars.cpp index 8692fccc95..da21362a5e 100644 --- a/src/html/htmlpars.cpp +++ b/src/html/htmlpars.cpp @@ -69,11 +69,11 @@ void wxHtmlParser::DoneParser() -#define HTML_MAX_BUFLEN 1024 +#define wxHTML_MAX_BUFLEN 1024 void wxHtmlParser::DoParsing(int begin_pos, int end_pos) { - char temp[HTML_BUFLEN], c; + char temp[wxHTML_BUFLEN], c; int i; int templen; @@ -86,7 +86,7 @@ void wxHtmlParser::DoParsing(int begin_pos, int end_pos) // continue building word: if (c != '<') { temp[templen++] = c; - if (templen == HTML_BUFLEN-1) { + if (templen == wxHTML_BUFLEN-1) { temp[templen] = 0; AddText(temp); templen = 0; @@ -137,11 +137,7 @@ void wxHtmlParser::AddTagHandler(wxHtmlTagHandler *handler) wxString s(handler -> GetSupportedTags()); wxStringTokenizer tokenizer(s, ", "); -#if (wxVERSION_NUMBER < 2100) - while (tokenizer.HasMoreToken()) -#else while (tokenizer.HasMoreTokens()) -#endif m_HandlersHash.Put(tokenizer.NextToken(), handler); if (m_HandlersList.IndexOf(handler) == wxNOT_FOUND) @@ -166,5 +162,5 @@ wxHtmlParser::~wxHtmlParser() //----------------------------------------------------------------------------- IMPLEMENT_ABSTRACT_CLASS(wxHtmlTagHandler,wxObject) +#endif -#endif \ No newline at end of file