From d43d9ee796f26f99832ce06203069fb9a522e091 Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Tue, 4 Jul 2006 09:12:34 +0000
Subject: [PATCH] was crashing wxCocoa builds (decomposition will be needed
 there as well, but the current implementation is based on the TEConverters)

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

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index 7961dfea8a..77c16d0d26 100644
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -3507,7 +3507,7 @@ static wxCSConv wxConvLocalObj(wxFONTENCODING_SYSTEM);
 static wxCSConv wxConvISO8859_1Obj(wxFONTENCODING_ISO8859_1);
 static wxMBConvUTF7 wxConvUTF7Obj;
 static wxMBConvUTF8 wxConvUTF8Obj;
-#ifdef __WXOSX__
+#if defined(__WXMAC__) && defined(TARGET_CARBON)
 static wxMBConv_macUTF8D wxConvMacUTF8DObj;
 #endif
 WXDLLIMPEXP_DATA_BASE(wxMBConv&) wxConvLibc = wxConvLibcObj;
@@ -3519,7 +3519,11 @@ WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvCurrent = &wxConvLibcObj;
 WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvUI = &wxConvLocal;
 WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvFileName = &
 #ifdef __WXOSX__
+#if defined(__WXMAC__) && defined(TARGET_CARBON)
                                     wxConvMacUTF8DObj;
+#else
+                                    wxConvUTF8Obj;
+#endif
 #else
                                     wxConvLibcObj;
 #endif
-- 
2.45.2