minimal changes needed to allow linking wxCocoa as shared lib

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

diff --git a/src/html/winpars.cpp b/src/html/winpars.cpp
index 1c86a5b76d8d27afdf858b4d9852afa6f3de2042..df118d282321f06bc7e56f619f5f076f4a50876c 100644 (file)
--- a/src/html/winpars.cpp
+++ b/src/html/winpars.cpp
@@ -38,6 +38,7 @@
 // wxHtmlWinParser
 //-----------------------------------------------------------------------------
 
+IMPLEMENT_ABSTRACT_CLASS(wxHtmlWinParser, wxHtmlParser)
 
 wxList wxHtmlWinParser::m_Modules;
 
@@ -188,10 +189,11 @@ void wxHtmlWinParser::InitParser(const wxString& source)
 #endif
 
     m_Container->InsertCell(new wxHtmlColourCell(m_ActualColor));
+    wxColour windowColour = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW) ;
     m_Container->InsertCell(
             new wxHtmlColourCell(GetWindow() ?
                                      GetWindow()->GetBackgroundColour() :
-                                     wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW),
+                                     windowColour,
                                  wxHTML_CLR_BACKGROUND));
     m_Container->InsertCell(new wxHtmlFontCell(CreateCurrentFont()));
 }
@@ -448,6 +450,7 @@ void wxHtmlWinParser::SetInputEncoding(wxFontEncoding enc)
     wxFontEncoding altfix, altnorm;
     bool availfix, availnorm;
 
+#ifndef __WXMAC__
     // exact match?
     availnorm = wxFontMapper::Get()->IsEncodingAvailable(enc, m_FontFaceNormal);
     availfix = wxFontMapper::Get()->IsEncodingAvailable(enc, m_FontFaceFixed);
@@ -469,6 +472,10 @@ void wxHtmlWinParser::SetInputEncoding(wxFontEncoding enc)
     // okay, let convert to ISO_8859-1, available always
     else
         m_OutputEnc = wxFONTENCODING_DEFAULT;
+#else
+    // we only have the current system encoding
+    m_OutputEnc = wxFONTENCODING_MACROMAN;
+#endif
 
     m_InputEnc = enc;
     if (m_OutputEnc == wxFONTENCODING_DEFAULT)