From 5c3c8676d6a99dc3e91ce1de6971dc44279aac38 Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Fri, 25 Mar 2005 17:31:38 +0000
Subject: [PATCH] add the mac specific encodings correctly

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33049 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/common/strconv.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index 1d40686112..792d2caa50 100644
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -2396,7 +2396,9 @@ wxMBConv *wxCSConv::DoCreate() const
 #endif // wxHAVE_WIN32_MB2WC
 #if defined(__WXMAC__)
     {
-        if ( m_name || ( m_encoding < wxFONTENCODING_UTF16BE ) )
+        // leave UTF16 and UTF32 to the built-ins of wx
+        if ( m_name || ( m_encoding < wxFONTENCODING_UTF16BE || 
+            ( m_encoding >= wxFONTENCODING_MACMIN && m_encoding <= wxFONTENCODING_MACMAX ) ) )
         {
 
 #if wxUSE_FONTMAP
-- 
2.45.2