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

changed format of wxFontMapper entries: facename_encoding instead of encoding as key

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5459 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2000-01-16 22:52:51 +00:00
parent 139ab6fc26
commit 62ea506eaf
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/common/fontmap.cpp
View File

@@ -521,7 +521,7 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
// wxFatalError doesn't return
}
wxString configEntry = GetEncodingName(encoding);
wxString configEntry = facename + _T("_") + GetEncodingName(encoding);
// do we have a font spec for this encoding?
wxString pathOld;
@@ -585,6 +585,7 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
wxFont font = retData.GetChosenFont();
*info = retData.EncodingInfo();
info -> encoding = retData.GetEncoding();
// remember this in the config
if ( ChangePath(FONTMAPPER_FONT_FROM_ENCODING_PATH, &pathOld) )
@@ -604,7 +605,6 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
// now try the default mappings:
wxFontEncodingArray equiv = wxEncodingConverter::GetAllEquivalents(encoding);
for ( unsigned i = (equiv[0] == encoding) ? 1 : 0; i < equiv.GetCount(); i++ )
if ( TestAltEncoding(configEntry, equiv[i], info) )
@@ -632,8 +632,12 @@ bool wxFontMapper::IsEncodingAvailable(wxFontEncoding encoding,
const wxString& facename)
{
wxNativeEncodingInfo info;
wxGetNativeFontEncoding(encoding, &info);
info.facename = facename;
return wxTestFontEncoding(info);
if (wxGetNativeFontEncoding(encoding, &info))
{
info.facename = facename;
return wxTestFontEncoding(info);
}
else
return FALSE;
}