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

use on cocoa without fontmapper

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32238 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ryan Norton
2005-02-20 08:45:29 +00:00
parent 7e00fd890f
commit a6900d1083
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/strconv.cpp
View File

@@ -1896,10 +1896,12 @@ public:
Init(CFStringGetSystemEncoding()) ; Init(CFStringGetSystemEncoding()) ;
} }
#if wxUSE_FONTMAP
wxMBConv_cocoa(const wxChar* name) wxMBConv_cocoa(const wxChar* name)
{ {
Init( wxCFStringEncFromFontEnc(wxFontMapper::Get()->CharsetToEncoding(name, false) ) ) ; Init( wxCFStringEncFromFontEnc(wxFontMapper::Get()->CharsetToEncoding(name, false) ) ) ;
} }
#endif
wxMBConv_cocoa(wxFontEncoding encoding) wxMBConv_cocoa(wxFontEncoding encoding)
{ {
@@ -2415,8 +2417,12 @@ wxMBConv *wxCSConv::DoCreate() const
if ( m_name || ( m_encoding <= wxFONTENCODING_UTF16 ) ) if ( m_name || ( m_encoding <= wxFONTENCODING_UTF16 ) )
{ {
#if wxUSE_FONTMAP
wxMBConv_cocoa *conv = m_name ? new wxMBConv_cocoa(m_name) wxMBConv_cocoa *conv = m_name ? new wxMBConv_cocoa(m_name)
: new wxMBConv_cocoa(m_encoding); : new wxMBConv_cocoa(m_encoding);
#else
wxMBConv_cocoa *conv = new wxMBConv_cocoa(m_encoding);
#endif
if ( conv->IsOk() ) if ( conv->IsOk() )
return conv; return conv;