preliminary fix, for using the correct output encoding on mac

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25267 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/html/winpars.cpp b/src/html/winpars.cpp
index e66c242518a26857752ab15aa1888f34c20e9398..df118d282321f06bc7e56f619f5f076f4a50876c 100644 (file)
--- a/src/html/winpars.cpp
+++ b/src/html/winpars.cpp
@@ -450,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);
@@ -471,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)