X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..e7300ec6d9ebbd1cfa2fcf12c0ce6e5aee85a152:/src/html/m_meta.cpp

diff --git a/src/html/m_meta.cpp b/src/html/m_meta.cpp
index bcb95e5840..9ad9eb7c4b 100644
--- 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,21 +38,21 @@ 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;
+                if (enc == m_WParser->GetInputEncoding()) return FALSE;
 
-                m_WParser -> SetInputEncoding(enc);
-                m_WParser -> GetContainer() -> InsertCell(
-                    new wxHtmlFontCell(m_WParser -> CreateCurrentFont()));
+                m_WParser->SetInputEncoding(enc);
+                m_WParser->GetContainer()->InsertCell(
+                    new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
             }
         }
         return FALSE;