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

Use wxFontMapperBase::Get instead of wxFontMapper::Get from wxBase code.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33068 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2005-03-26 06:51:56 +00:00
parent 061896d126
commit 267e11c550
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/intl.cpp
View File

@@ -1243,7 +1243,7 @@ void wxMsgCatalogFile::FillHash(wxMessagesHash& hash,
if ( convertEncoding )
{
wxFontEncoding targetEnc = wxFONTENCODING_SYSTEM;
wxFontEncoding enc = wxFontMapper::Get()->CharsetToEncoding(m_charset, false);
wxFontEncoding enc = wxFontMapperBase::Get()->CharsetToEncoding(m_charset, false);
if ( enc == wxFONTENCODING_SYSTEM )
{
convertEncoding = false; // unknown encoding
@@ -2321,7 +2321,7 @@ wxFontEncoding wxLocale::GetSystemEncoding()
wxString encname = GetSystemEncodingName();
if ( !encname.empty() )
{
wxFontEncoding enc = wxFontMapper::Get()->
wxFontEncoding enc = (wxFontMapperBase::Get())->
CharsetToEncoding(encname, false /* not interactive */);
// on some modern Linux systems (RedHat 8) the default system locale