AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Enable compilation on mac without wxFontMapper

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32114 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ryan Norton 2005-02-17 10:38:45 +00:00
parent c5ceb215a9
commit 2d1659cf32
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/strconv.cpp
View File

@ -2042,10 +2042,12 @@ public:
Init(CFStringGetSystemEncoding()) ;
}
#if wxUSE_FONTMAP
wxMBConv_mac(const wxChar* name)
{
Init( wxMacGetSystemEncFromFontEnc(wxFontMapper::Get()->CharsetToEncoding(name, false) ) ) ;
}
#endif
wxMBConv_mac(wxFontEncoding encoding)
{
@ -2395,8 +2397,12 @@ wxMBConv *wxCSConv::DoCreate() const
if ( m_name || ( m_encoding < wxFONTENCODING_UTF16BE ) )
{
#if wxUSE_FONTMAP
wxMBConv_mac *conv = m_name ? new wxMBConv_mac(m_name)
: new wxMBConv_mac(m_encoding);
#else
wxMBConv_mac *conv = new wxMBConv_mac(m_encoding);
#endif
if ( conv->IsOk() )
return conv;