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

fixed unreadable formatting

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52467 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2008-03-13 14:21:25 +00:00
parent 81a2edf9a9
commit 8aef90e872
1 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/html/winpars.cpp
View File

@@ -467,8 +467,10 @@ wxHtmlContainerCell* wxHtmlWinParser::CloseContainer()
void wxHtmlWinParser::SetFontSize(int s) void wxHtmlWinParser::SetFontSize(int s)
{ {
if (s < 1) s = 1; if (s < 1)
else if (s > 7) s = 7; s = 1;
else if (s > 7)
s = 7;
m_FontSize = s; m_FontSize = s;
} }
@@ -529,8 +531,10 @@ void wxHtmlWinParser::SetLink(const wxHtmlLinkInfo& link)
void wxHtmlWinParser::SetFontFace(const wxString& face) void wxHtmlWinParser::SetFontFace(const wxString& face)
{ {
if (GetFontFixed()) m_FontFaceFixed = face; if (GetFontFixed())
else m_FontFaceNormal = face; m_FontFaceFixed = face;
else
m_FontFaceNormal = face;
#if !wxUSE_UNICODE #if !wxUSE_UNICODE
if (m_InputEnc != wxFONTENCODING_DEFAULT) if (m_InputEnc != wxFONTENCODING_DEFAULT)
@@ -562,29 +566,37 @@ void wxHtmlWinParser::SetInputEncoding(wxFontEncoding enc)
m_EncConv = NULL; m_EncConv = NULL;
} }
if (enc == wxFONTENCODING_DEFAULT) return; if (enc == wxFONTENCODING_DEFAULT)
return;
wxFontEncoding altfix, altnorm; wxFontEncoding altfix, altnorm;
bool availfix, availnorm; bool availfix, availnorm;
// 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);
if (availnorm && availfix)
m_OutputEnc = enc;
// alternatives? if (availnorm && availfix)
{
// exact match?
m_OutputEnc = enc;
}
else if (wxFontMapper::Get()->GetAltForEncoding(enc, &altnorm, m_FontFaceNormal, false) && else if (wxFontMapper::Get()->GetAltForEncoding(enc, &altnorm, m_FontFaceNormal, false) &&
wxFontMapper::Get()->GetAltForEncoding(enc, &altfix, m_FontFaceFixed, false) && wxFontMapper::Get()->GetAltForEncoding(enc, &altfix, m_FontFaceFixed, false) &&
altnorm == altfix) altnorm == altfix)
{
// alternatives?
m_OutputEnc = altnorm; m_OutputEnc = altnorm;
}
// at least normal face?
else if (availnorm) else if (availnorm)
{
// at least normal face?
m_OutputEnc = enc; m_OutputEnc = 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;
}
else else
{ {
#ifndef __WXMAC__ #ifndef __WXMAC__
@@ -597,11 +609,16 @@ void wxHtmlWinParser::SetInputEncoding(wxFontEncoding enc)
m_InputEnc = enc; m_InputEnc = enc;
if (m_OutputEnc == wxFONTENCODING_DEFAULT) if (m_OutputEnc == wxFONTENCODING_DEFAULT)
{
GetEntitiesParser()->SetEncoding(wxFONTENCODING_SYSTEM); GetEntitiesParser()->SetEncoding(wxFONTENCODING_SYSTEM);
}
else else
{
GetEntitiesParser()->SetEncoding(m_OutputEnc); GetEntitiesParser()->SetEncoding(m_OutputEnc);
}
if (m_InputEnc == m_OutputEnc) return; if (m_InputEnc == m_OutputEnc)
return;
m_EncConv = new wxEncodingConverter(); m_EncConv = new wxEncodingConverter();
if (!m_EncConv->Init(m_InputEnc, if (!m_EncConv->Init(m_InputEnc,