fixed (and slightly cleant up) wxGTK compilation

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

diff --git a/src/html/m_meta.cpp b/src/html/m_meta.cpp
index 50c100bc87ab08ceacc567330e80e39cba8cb098..9ad9eb7c4bb36a43e6b9c47200df2da5fbba35d8 100644 (file)
--- a/src/html/m_meta.cpp
+++ b/src/html/m_meta.cpp
@@ -22,7 +22,6 @@
 #endif
 
 #ifndef WXPRECOMP
-#include "wx/wx.h"
 #endif
 
 #include "wx/fontmap.h"
@@ -39,15 +38,15 @@ TAG_HANDLER_BEGIN(META, "META")
 
     TAG_HANDLER_PROC(tag)
     {
-        if (tag.HasParam(_T("HTTP-EQUIV")) && 
+        if (tag.HasParam(_T("HTTP-EQUIV")) &&
             tag.GetParam(_T("HTTP-EQUIV")) == _T("Content-Type") &&
             tag.HasParam(_T("CONTENT")))
         {
             wxString content = tag.GetParam(_T("CONTENT"));
             if (content.Left(19) == _T("text/html; charset="))
             {
-                wxFontEncoding enc = 
-                    wxTheFontMapper->CharsetToEncoding(content.Mid(19));
+                wxFontEncoding enc =
+                    wxFontMapper::Get()->CharsetToEncoding(content.Mid(19));
                 if (enc == wxFONTENCODING_SYSTEM) return FALSE;
                 if (enc == m_WParser->GetInputEncoding()) return FALSE;