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

12
src/common/strconv.cpp
View File

@@ -1899,7 +1899,7 @@ public:
#if wxUSE_FONTMAP #if wxUSE_FONTMAP
wxMBConv_cocoa(const wxChar* name) wxMBConv_cocoa(const wxChar* name)
{ {
Init( wxCFStringEncFromFontEnc(wxFontMapper::Get()->CharsetToEncoding(name, false) ) ) ; Init( wxCFStringEncFromFontEnc(wxFontMapperBase::Get()->CharsetToEncoding(name, false) ) ) ;
} }
#endif #endif
@@ -2047,7 +2047,7 @@ public:
#if wxUSE_FONTMAP #if wxUSE_FONTMAP
wxMBConv_mac(const wxChar* name) wxMBConv_mac(const wxChar* name)
{ {
Init( wxMacGetSystemEncFromFontEnc(wxFontMapper::Get()->CharsetToEncoding(name, false) ) ) ; Init( wxMacGetSystemEncFromFontEnc(wxFontMapperBase::Get()->CharsetToEncoding(name, false) ) ) ;
} }
#endif #endif
@@ -2210,7 +2210,7 @@ public:
wxMBConv_wxwin(const wxChar* name) wxMBConv_wxwin(const wxChar* name)
{ {
if (name) if (name)
m_enc = wxFontMapper::Get()->CharsetToEncoding(name, false); m_enc = wxFontMapperBase::Get()->CharsetToEncoding(name, false);
else else
m_enc = wxFONTENCODING_SYSTEM; m_enc = wxFONTENCODING_SYSTEM;
@@ -2369,7 +2369,7 @@ wxMBConv *wxCSConv::DoCreate() const
#if wxUSE_FONTMAP #if wxUSE_FONTMAP
if ( name.empty() ) if ( name.empty() )
name = wxFontMapper::Get()->GetEncodingName(m_encoding); name = wxFontMapperBase::Get()->GetEncodingName(m_encoding);
#endif // wxUSE_FONTMAP #endif // wxUSE_FONTMAP
wxMBConv_iconv *conv = new wxMBConv_iconv(name); wxMBConv_iconv *conv = new wxMBConv_iconv(name);
@@ -2440,7 +2440,7 @@ wxMBConv *wxCSConv::DoCreate() const
// use "false" to suppress interactive dialogs -- we can be called from // use "false" to suppress interactive dialogs -- we can be called from
// anywhere and popping up a dialog from here is the last thing we want to // anywhere and popping up a dialog from here is the last thing we want to
// do // do
enc = wxFontMapper::Get()->CharsetToEncoding(m_name, false); enc = wxFontMapperBase::Get()->CharsetToEncoding(m_name, false);
} }
#endif // wxUSE_FONTMAP #endif // wxUSE_FONTMAP
@@ -2496,7 +2496,7 @@ wxMBConv *wxCSConv::DoCreate() const
m_name ? m_name m_name ? m_name
: :
#if wxUSE_FONTMAP #if wxUSE_FONTMAP
wxFontMapper::GetEncodingDescription(m_encoding).c_str() wxFontMapperBase::GetEncodingDescription(m_encoding).c_str()
#else // !wxUSE_FONTMAP #else // !wxUSE_FONTMAP
wxString::Format(_("encoding %s"), m_encoding).c_str() wxString::Format(_("encoding %s"), m_encoding).c_str()
#endif // wxUSE_FONTMAP/!wxUSE_FONTMAP #endif // wxUSE_FONTMAP/!wxUSE_FONTMAP

2
src/msw/utils.cpp
View File

@@ -1410,7 +1410,7 @@ extern long wxCharsetToCodepage(const wxChar *name)
if ( !name ) if ( !name )
return -1; return -1;
wxFontEncoding enc = wxFontMapper::Get()->CharsetToEncoding(name, false); wxFontEncoding enc = wxFontMapperBase::Get()->CharsetToEncoding(name, false);
if ( enc == wxFONTENCODING_SYSTEM ) if ( enc == wxFONTENCODING_SYSTEM )
return -1; return -1;