X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/554fdf48f5487958a434571266258cecae14e51d..0bbe61b8c18a1795189f0cf73cc61c14a0fb846d:/src/common/encconv.cpp diff --git a/src/common/encconv.cpp b/src/common/encconv.cpp index a44449dc0d..da88c09d52 100644 --- a/src/common/encconv.cpp +++ b/src/common/encconv.cpp @@ -32,15 +32,8 @@ #endif #ifdef __WXMAC__ -#ifdef __DARWIN__ -#include -#else -#include -#include -#include -#endif - #include "wx/fontutil.h" - #include "wx/mac/private.h" // includes mac headers + #include "wx/mac/corefoundation/cfstring.h" + #include 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] ; @@ -98,7 +91,7 @@ CompareCharsetItems(const void *i1, const void *i2) } -static CharsetItem* BuildReverseTable(wxUint16 *tbl) +static CharsetItem* BuildReverseTable(const wxUint16 *tbl) { CharsetItem *rev = new CharsetItem[128]; @@ -124,7 +117,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;} @@ -374,11 +368,12 @@ wxString wxEncodingConverter::Convert(const wxString& input) const #define STOP wxFONTENCODING_SYSTEM #define NUM_OF_PLATFORMS 4 /*must conform to enum wxPLATFORM_XXXX !!!*/ -#define ENC_PER_PLATFORM 5 - // max no. of encodings for one language used on one platform - // Anybody thinks 5 is not enough? ;-) +#define ENC_PER_PLATFORM 3 + // 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 wxFontEncoding +static const wxFontEncoding EquivalentEncodings[][NUM_OF_PLATFORMS][ENC_PER_PLATFORM+1] = { // *** Please put more common encodings as first! *** @@ -477,7 +472,7 @@ wxFontEncodingArray wxEncodingConverter::GetPlatformEquivalents(wxFontEncoding e } int i, clas, e ; - wxFontEncoding *f; + const wxFontEncoding *f; wxFontEncodingArray arr; clas = 0; @@ -504,7 +499,7 @@ wxFontEncodingArray wxEncodingConverter::GetPlatformEquivalents(wxFontEncoding e wxFontEncodingArray wxEncodingConverter::GetAllEquivalents(wxFontEncoding enc) { int i, clas, e, j ; - wxFontEncoding *f; + const wxFontEncoding *f; wxFontEncodingArray arr; arr = GetPlatformEquivalents(enc); // we want them to be first items in array