Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

no message

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25317 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2004-01-22 20:09:31 +00:00
parent a2d452d042
commit c83e123712
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/html/winpars.cpp
View File

@@ -450,7 +450,6 @@ void wxHtmlWinParser::SetInputEncoding(wxFontEncoding enc)
wxFontEncoding altfix, altnorm; wxFontEncoding altfix, altnorm;
bool availfix, availnorm; bool availfix, availnorm;
#ifndef __WXMAC__
// exact match? // exact match?
availnorm = wxFontMapper::Get()->IsEncodingAvailable(enc, m_FontFaceNormal); availnorm = wxFontMapper::Get()->IsEncodingAvailable(enc, m_FontFaceNormal);
availfix = wxFontMapper::Get()->IsEncodingAvailable(enc, m_FontFaceFixed); availfix = wxFontMapper::Get()->IsEncodingAvailable(enc, m_FontFaceFixed);
@@ -469,13 +468,15 @@ void wxHtmlWinParser::SetInputEncoding(wxFontEncoding enc)
else if (wxFontMapper::Get()->GetAltForEncoding(enc, &altnorm, m_FontFaceNormal, FALSE)) else if (wxFontMapper::Get()->GetAltForEncoding(enc, &altnorm, m_FontFaceNormal, FALSE))
m_OutputEnc = altnorm; m_OutputEnc = altnorm;
// okay, let convert to ISO_8859-1, available always
else else
{
#ifndef __WXMAC__
// okay, let convert to ISO_8859-1, available always
m_OutputEnc = wxFONTENCODING_DEFAULT; m_OutputEnc = wxFONTENCODING_DEFAULT;
#else #else
// we only have the current system encoding m_OutputEnc = wxLocale::GetSystemEncoding() ;
m_OutputEnc = wxFONTENCODING_MACROMAN;
#endif #endif
}
m_InputEnc = enc; m_InputEnc = enc;
if (m_OutputEnc == wxFONTENCODING_DEFAULT) if (m_OutputEnc == wxFONTENCODING_DEFAULT)