Applied patch [ 872338 ] Minor fixes to forty, fractal and poem demos

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

diff --git a/src/html/htmlpars.cpp b/src/html/htmlpars.cpp
index ae2ccef9a74461299a3e005cc213ffdc0424e95c..ae752eafbad4a181c2c048f2f9bddd78fe31d845 100644 (file)
--- 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
 
 #pragma implementation "htmlpars.h"
 #endif
 


@@ -35,6 +35,11 @@
 #include "wx/dynarray.h"
 #include "wx/arrimpl.cpp"
 
 #include "wx/dynarray.h"
 #include "wx/arrimpl.cpp"
 

+
+// DLL options compatibility check:
+#include "wx/app.h"
+WX_CHECK_BUILD_OPTIONS("wxHTML")
+

 //-----------------------------------------------------------------------------
 // wxHtmlParser helpers
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // 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")))
     {
         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);
         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;
 }
 
     return charset;
 }
 

-

 #endif
 #endif