X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/10b9be3230a400b02df9d5c9d9e1986570ecb5b5..abb4f9c93715f5b00c526203af96ed2938a1a2c3:/src/html/htmltag.cpp diff --git a/src/html/htmltag.cpp b/src/html/htmltag.cpp index 0149450543..98a1ff4fba 100644 --- a/src/html/htmltag.cpp +++ b/src/html/htmltag.cpp @@ -7,11 +7,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "htmltag.h" -#endif - #include "wx/wxprec.h" #include "wx/defs.h" @@ -114,14 +109,14 @@ wxHtmlTagsCache::wxHtmlTagsCache(const wxString& source) else { m_Cache[tg].End1 = m_Cache[tg].End2 = -1; - + if (wxIsCDATAElement(tagBuffer)) { // store the orig pos in case we are missing the closing // tag (see below) - wxInt32 old_pos = pos; + wxInt32 old_pos = pos; bool foundCloseTag = false; - + // find next matching tag int tag_len = wxStrlen(tagBuffer); while (pos < lng) @@ -152,7 +147,7 @@ wxHtmlTagsCache::wxHtmlTagsCache(const wxString& source) } // found a match - if (match_pos == tag_len) + if (match_pos == tag_len) { pos = pos - tag_len - 3; foundCloseTag = true; @@ -365,12 +360,12 @@ wxHtmlTag::wxHtmlTag(wxHtmlTag *parent, } #undef IS_WHITE - } - m_Begin = i; + } + m_Begin = i; - cache->QueryTag(pos, &m_End1, &m_End2); - if (m_End1 > end_pos) m_End1 = end_pos; - if (m_End2 > end_pos) m_End2 = end_pos; + cache->QueryTag(pos, &m_End1, &m_End2); + if (m_End1 > end_pos) m_End1 = end_pos; + if (m_End2 > end_pos) m_End2 = end_pos; } wxHtmlTag::~wxHtmlTag() @@ -521,13 +516,4 @@ wxHtmlTag *wxHtmlTag::GetNextTag() const return cur->m_Next; } -#if WXWIN_COMPATIBILITY_2_2 - -bool wxHtmlTag::IsEnding() const -{ - return false; -} - -#endif // WXWIN_COMPATIBILITY_2_2 - #endif