Fix calculation of the margins for owner-drawn menu items.

[wxWidgets.git] / src / common / encconv.cpp

diff --git a/src/common/encconv.cpp b/src/common/encconv.cpp
index 9e06d0df43749e26441bdc1cb4187860e83a6cc9..92c8b04362f0092e81484acd7091b1c3fa300f1e 100644 (file)
--- 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] ;
@@ -50,7 +43,7 @@
     #include "wx/msw/wince/missing.h"       // for bsearch()
 #endif
 
-static wxUint16* GetEncTable(wxFontEncoding enc)
+static const wxUint16* GetEncTable(wxFontEncoding enc)
 {
 #ifdef __WXMAC__
     if( enc >= wxFONTENCODING_MACMIN && enc <= wxFONTENCODING_MACMAX )
@@ -58,20 +51,20 @@ static 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] ;
@@ -91,14 +84,16 @@ typedef struct {
     wxUint8  c;
 } CharsetItem;
 
-extern "C" int wxCMPFUNC_CONV
+extern "C"
+{
+static int wxCMPFUNC_CONV
 CompareCharsetItems(const void *i1, const void *i2)
 {
     return ( ((CharsetItem*)i1) -> u - ((CharsetItem*)i2) -> u );
 }
+}
 
-
-static CharsetItem* BuildReverseTable(wxUint16 *tbl)
+static CharsetItem* BuildReverseTable(const wxUint16 *tbl)
 {
     CharsetItem *rev = new CharsetItem[128];
 
@@ -124,7 +119,8 @@ wxEncodingConverter::wxEncodingConverter()
 bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_enc, int method)
 {
     unsigned i;
-    wxUint16 *in_tbl, *out_tbl = NULL;
+    const wxUint16 *in_tbl;
+    const wxUint16 *out_tbl = NULL;
 
     if (m_Table) {delete[] m_Table; m_Table = NULL;}
 
@@ -327,7 +323,7 @@ bool wxEncodingConverter::Convert(const wchar_t* input, wchar_t* output) const
                 wxT("You must call wxEncodingConverter::Init() before actually converting!"));
 
     bool replaced = false;
-    
+
     for (i = input, o = output; *i != 0;)
         *(o++) = (wchar_t)(GetTableValue(m_Table, (wxUint8)*(i++), replaced));
     *o = 0;
@@ -375,11 +371,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] = {