X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2eb10e2a17a02acaaa32a41304243999f3a862a1..708c45a6cef439edb007ca8f8329582244f152f5:/src/html/htmlpars.cpp diff --git a/src/html/htmlpars.cpp b/src/html/htmlpars.cpp index ae2ccef9a7..ae752eafba 100644 --- a/src/html/htmlpars.cpp +++ b/src/html/htmlpars.cpp @@ -8,7 +8,7 @@ ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "htmlpars.h" #endif @@ -35,6 +35,11 @@ #include "wx/dynarray.h" #include "wx/arrimpl.cpp" + +// DLL options compatibility check: +#include "wx/app.h" +WX_CHECK_BUILD_OPTIONS("wxHTML") + //----------------------------------------------------------------------------- // wxHtmlParser helpers //----------------------------------------------------------------------------- @@ -894,7 +899,7 @@ bool wxMetaTagHandler::HandleTag(const wxHtmlTag& tag) tag.GetParam(_T("HTTP-EQUIV")).IsSameAs(_T("Content-Type"), false) && tag.HasParam(_T("CONTENT"))) { - wxString content = tag.GetParam(_T("CONTENT")); + wxString content = tag.GetParam(_T("CONTENT")).Lower(); if (content.Left(19) == _T("text/html; charset=")) { *m_retval = content.Mid(19); @@ -915,5 +920,4 @@ wxString wxHtmlParser::ExtractCharsetInformation(const wxString& markup) return charset; } - #endif