]> git.saurik.com Git - wxWidgets.git/commitdiff
use on cocoa without fontmapper
authorRyan Norton <wxprojects@comcast.net>
Sun, 20 Feb 2005 08:45:29 +0000 (08:45 +0000)
committerRyan Norton <wxprojects@comcast.net>
Sun, 20 Feb 2005 08:45:29 +0000 (08:45 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32238 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/common/strconv.cpp

index 521b70e56ff5e4c06221fa897e94bd32fa921cb7..76282821dbe1bd887e5d727add6bee9f62c2d382 100644 (file)
@@ -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;