From 90548138ac2c372ad2ba3b0c3bf570797828e2a8 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Tue, 20 Jan 2004 22:01:43 +0000 Subject: [PATCH] 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 --- src/html/winpars.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/html/winpars.cpp b/src/html/winpars.cpp index e66c242518..df118d2823 100644 --- 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) -- 2.45.2