Don't crash in wxControl::GetLabel when getting the label

[wxWidgets.git] / src / html / htmltag.cpp

diff --git a/src/html/htmltag.cpp b/src/html/htmltag.cpp
index e8d244a2ee01f78eecaa5c29ecebd5a4d5f326c8..656ec5efce229f84c209e7435f64c03870697295 100644 (file)
--- a/src/html/htmltag.cpp
+++ b/src/html/htmltag.cpp
@@ -8,7 +8,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "htmltag.h"
 #endif
 
@@ -57,7 +57,7 @@ IMPLEMENT_CLASS(wxHtmlTagsCache,wxObject)
 
 #define CACHE_INCREMENT  64
 
-inline bool wxIsCDATAElement(const wxChar *tag)
+bool wxIsCDATAElement(const wxChar *tag)
 {
     return (wxStrcmp(tag, _T("SCRIPT")) == 0) ||
            (wxStrcmp(tag, _T("STYLE")) == 0);
@@ -131,7 +131,9 @@ wxHtmlTagsCache::wxHtmlTagsCache(const wxString& source)
                         // see if it matches
                         int match_pos = 0;
                         while (pos < lng && match_pos < tag_len && src[pos] != '>' && src[pos] != '<') {
-                            if (wxToupper(src[pos]) == tagBuffer[match_pos]) {
+                            // cast to wxChar needed to suppress warning in
+                            // Unicode build
+                            if ((wxChar)wxToupper(src[pos]) == tagBuffer[match_pos]) {
                                 ++match_pos;
                             }  
                             else if (src[pos] == wxT(' ') || src[pos] == wxT('\n') ||