From a6900d10834289890aec85313efefe9997c5203f Mon Sep 17 00:00:00 2001 From: Ryan Norton Date: Sun, 20 Feb 2005 08:45:29 +0000 Subject: [PATCH] use on cocoa without fontmapper git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32238 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 521b70e56f..76282821db 100644 --- a/src/common/strconv.cpp +++ b/src/common/strconv.cpp @@ -1896,10 +1896,12 @@ public: Init(CFStringGetSystemEncoding()) ; } +#if wxUSE_FONTMAP wxMBConv_cocoa(const wxChar* name) { Init( wxCFStringEncFromFontEnc(wxFontMapper::Get()->CharsetToEncoding(name, false) ) ) ; } +#endif wxMBConv_cocoa(wxFontEncoding encoding) { @@ -2415,8 +2417,12 @@ wxMBConv *wxCSConv::DoCreate() const if ( m_name || ( m_encoding <= wxFONTENCODING_UTF16 ) ) { +#if wxUSE_FONTMAP wxMBConv_cocoa *conv = m_name ? new wxMBConv_cocoa(m_name) : new wxMBConv_cocoa(m_encoding); +#else + wxMBConv_cocoa *conv = new wxMBConv_cocoa(m_encoding); +#endif if ( conv->IsOk() ) return conv; -- 2.45.2