From 2d1659cf32df1090639500925f0f40b13e88cc00 Mon Sep 17 00:00:00 2001 From: Ryan Norton Date: Thu, 17 Feb 2005 10:38:45 +0000 Subject: [PATCH] Enable compilation on mac without wxFontMapper git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32114 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/strconv.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp index 5ceede4225..521b70e56f 100644 --- a/src/common/strconv.cpp +++ b/src/common/strconv.cpp @@ -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;