X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4f44ea367d2bf06def0f0e65b4b064facb370404..44fd6f721ad375033b2a2b64ac5f703ac70cb8f0:/src/html/winpars.cpp diff --git a/src/html/winpars.cpp b/src/html/winpars.cpp index e66c242518..e994399b8b 100644 --- a/src/html/winpars.cpp +++ b/src/html/winpars.cpp @@ -4,7 +4,7 @@ // Author: Vaclav Slavik // RCS-ID: $Id$ // Copyright: (c) 1999 Vaclav Slavik -// Licence: wxWindows Licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -468,9 +468,15 @@ void wxHtmlWinParser::SetInputEncoding(wxFontEncoding enc) else if (wxFontMapper::Get()->GetAltForEncoding(enc, &altnorm, m_FontFaceNormal, FALSE)) m_OutputEnc = altnorm; - // okay, let convert to ISO_8859-1, available always else + { +#ifndef __WXMAC__ + // okay, let convert to ISO_8859-1, available always m_OutputEnc = wxFONTENCODING_DEFAULT; +#else + m_OutputEnc = wxLocale::GetSystemEncoding() ; +#endif + } m_InputEnc = enc; if (m_OutputEnc == wxFONTENCODING_DEFAULT)