X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cd1a22d1d32ddb1ed65c0443e8333d3d3e12ca81..12b5f4b4d2d8a07962da7ba3b78c8c1ec2634a67:/src/common/encconv.cpp

diff --git a/src/common/encconv.cpp b/src/common/encconv.cpp
index f43d0687e4..80642b96f1 100644
--- a/src/common/encconv.cpp
+++ b/src/common/encconv.cpp
@@ -32,15 +32,8 @@
 #endif
 
 #ifdef __WXMAC__
-#ifdef __DARWIN__
-#include <Carbon/Carbon.h>
-#else
-#include <ATSUnicode.h>
-#include <TextCommon.h>
-#include <TextEncodingConverter.h>
-#endif
-    #include "wx/fontutil.h"
-    #include "wx/mac/private.h"  // includes mac headers
+    #include "wx/osx/core/cfstring.h"
+    #include <CoreFoundation/CFStringEncodingExt.h>
 
     wxUint16 gMacEncodings[wxFONTENCODING_MACMAX-wxFONTENCODING_MACMIN+1][128] ;
     bool gMacEncodingsInited[wxFONTENCODING_MACMAX-wxFONTENCODING_MACMIN+1] ;
@@ -58,20 +51,20 @@ static const wxUint16* GetEncTable(wxFontEncoding enc)
         int i = enc-wxFONTENCODING_MACMIN ;
         if ( gMacEncodingsInited[i] == false )
         {
-            TECObjectRef converter ;
-            TextEncodingBase code = wxMacGetSystemEncFromFontEnc( enc ) ;
-            TextEncodingBase unicode = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicode16BitFormat) ;
-            OSStatus status = TECCreateConverter(&converter,code,unicode);
-            char s[2] ;
-            s[1] = 0 ;
-            ByteCount byteInLen, byteOutLen ;
+            // create 
+            CFStringEncoding cfencoding = wxMacGetSystemEncFromFontEnc( enc ) ;
+            if( !CFStringIsEncodingAvailable( cfencoding ) )
+                return NULL;
+                
+            memset( gMacEncodings[i] , 0 , 128 * 2 );
+            char s[2] = { 0 , 0 };
+            CFRange firstchar = CFRangeMake( 0, 1 );
             for( unsigned char c = 255 ; c >= 128 ; --c )
             {
                 s[0] = c ;
-                status = TECConvertText(converter, (ConstTextPtr) &s , 1, &byteInLen,
-                (TextPtr) &gMacEncodings[i][c-128] , 2, &byteOutLen);
+                wxCFStringRef cfref( CFStringCreateWithCStringNoCopy( NULL, s, cfencoding , kCFAllocatorNull ) );
+                CFStringGetCharacters( cfref, firstchar, (UniChar*)  &gMacEncodings[i][c-128] );
             }
-            status = TECDisposeConverter(converter);
             gMacEncodingsInited[i]=true;
         }
         return gMacEncodings[i] ;
@@ -376,11 +369,9 @@ wxString wxEncodingConverter::Convert(const wxString& input) const
 
 #define NUM_OF_PLATFORMS  4 /*must conform to enum wxPLATFORM_XXXX !!!*/
 #define ENC_PER_PLATFORM  3
-           // max no. of encodings for one language used on one platform
-           // Anybody thinks 5 is not enough? ;-)
-
-           // It is too much. Using maximum of everything at the current moment to not
-           // make the library larger than necessary. Make larger only if necessary - MR
+           // max no. of encodings for one language used on one platform.
+           // Using maximum of everything at the current moment to not make the
+           // library larger than necessary. Make larger only if necessary - MR
 
 static const wxFontEncoding
     EquivalentEncodings[][NUM_OF_PLATFORMS][ENC_PER_PLATFORM+1] = {