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 7c0c379b8845892a4142a4afeeaa148ccd7a1cd0..9ad9eb7c4bb36a43e6b9c47200df2da5fbba35d8 100644 (file)
--- a/src/html/m_meta.cpp
+++ b/src/html/m_meta.cpp
@@ -15,14 +15,13 @@
 
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"

-#if wxUSE_HTML
+#if wxUSE_HTML && wxUSE_STREAMS

 
 #ifdef __BORDLANDC__
 #pragma hdrstop
 #endif
 
 #ifndef WXPRECOMP
 
 #ifdef __BORDLANDC__
 #pragma hdrstop
 #endif
 
 #ifndef WXPRECOMP

-#include "wx/wx.h"

 #endif
 
 #include "wx/fontmap.h"
 #endif
 
 #include "wx/fontmap.h"


@@ -39,21 +38,21 @@ TAG_HANDLER_BEGIN(META, "META")
 
     TAG_HANDLER_PROC(tag)
     {
 
     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="))
             {
             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 == 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;
             }
         }
         return FALSE;