X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5d464b982709f072939b2bcd51861371d2a11bf..e6bd0b8ba69c27f5dc5900b0e204d600a544e260:/src/html/htmltag.cpp

diff --git a/src/html/htmltag.cpp b/src/html/htmltag.cpp
index c14b39fe2d..c52656cc8c 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
@@ -149,7 +149,6 @@ wxHtmlTagsCache::wxHtmlTagsCache(const wxString& source)
                         // found a match
                         if (match_pos == tag_len) {
                             pos = pos - tag_len - 3;
-                            stpos = pos;
                             break;
                         }
                         else {
@@ -393,7 +392,7 @@ bool wxHtmlTag::GetParamAsColour(const wxString& par, wxColour *clr) const
 {
     wxString str = GetParam(par);
 
-    if (str.IsEmpty()) return false;
+    if (str.empty()) return false;
     if (str.GetChar(0) == wxT('#'))
     {
         unsigned long tmp;
@@ -496,4 +495,13 @@ 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