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

fix for typo

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12157 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-10-23 23:21:31 +00:00
parent a29a241fd6
commit 91cddacfe0
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/src/xrc/xmlres.cpp
View File

@@ -808,8 +808,10 @@ wxFont wxXmlResourceHandler::GetFont(const wxString& param)
wxString encoding = GetParamValue(wxT("encoding")); wxString encoding = GetParamValue(wxT("encoding"));
wxFontMapper mapper; wxFontMapper mapper;
wxFontEncoding enc = wxFONTENCODING_DEFAULT; wxFontEncoding enc = wxFONTENCODING_DEFAULT;
if (!encoding.IsEmpty()) enc = mapper.CharsetToEncoding(encoding); if (!encoding.IsEmpty())
if (enc == wxFONTENCODING_SYSTEM) enc = wxFONTENCODING_SYSTEM; enc = mapper.CharsetToEncoding(encoding);
if (enc == wxFONTENCODING_SYSTEM)
enc = wxFONTENCODING_DEFAULT;
wxString faces = GetParamValue(wxT("face")); wxString faces = GetParamValue(wxT("face"));
wxString facename = wxEmptyString; wxString facename = wxEmptyString;

6
src/xrc/xmlres.cpp
View File

@@ -808,8 +808,10 @@ wxFont wxXmlResourceHandler::GetFont(const wxString& param)
wxString encoding = GetParamValue(wxT("encoding")); wxString encoding = GetParamValue(wxT("encoding"));
wxFontMapper mapper; wxFontMapper mapper;
wxFontEncoding enc = wxFONTENCODING_DEFAULT; wxFontEncoding enc = wxFONTENCODING_DEFAULT;
if (!encoding.IsEmpty()) enc = mapper.CharsetToEncoding(encoding); if (!encoding.IsEmpty())
if (enc == wxFONTENCODING_SYSTEM) enc = wxFONTENCODING_SYSTEM; enc = mapper.CharsetToEncoding(encoding);
if (enc == wxFONTENCODING_SYSTEM)
enc = wxFONTENCODING_DEFAULT;
wxString faces = GetParamValue(wxT("face")); wxString faces = GetParamValue(wxT("face"));
wxString facename = wxEmptyString; wxString facename = wxEmptyString;