Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleaning up common OSX code

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52385 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2008-03-08 15:46:39 +00:00
parent a7c93f3fbf
commit e84f729000
1 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/common/encconv.cpp
View File

@@ -32,15 +32,8 @@
#endif #endif
#ifdef __WXMAC__ #ifdef __WXMAC__
#ifdef __DARWIN__ #include "wx/mac/corefoundation/cfstring.h"
#include <Carbon/Carbon.h> #include <CoreFoundation/CFStringEncodingExt.h>
#else
#include <ATSUnicode.h>
#include <TextCommon.h>
#include <TextEncodingConverter.h>
#endif
#include "wx/fontutil.h"
#include "wx/mac/private.h" // includes mac headers
wxUint16 gMacEncodings[wxFONTENCODING_MACMAX-wxFONTENCODING_MACMIN+1][128] ; wxUint16 gMacEncodings[wxFONTENCODING_MACMAX-wxFONTENCODING_MACMIN+1][128] ;
bool gMacEncodingsInited[wxFONTENCODING_MACMAX-wxFONTENCODING_MACMIN+1] ; bool gMacEncodingsInited[wxFONTENCODING_MACMAX-wxFONTENCODING_MACMIN+1] ;
@@ -58,20 +51,20 @@ static const wxUint16* GetEncTable(wxFontEncoding enc)
int i = enc-wxFONTENCODING_MACMIN ; int i = enc-wxFONTENCODING_MACMIN ;
if ( gMacEncodingsInited[i] == false ) if ( gMacEncodingsInited[i] == false )
{ {
TECObjectRef converter ; // create
TextEncodingBase code = wxMacGetSystemEncFromFontEnc( enc ) ; CFStringEncoding cfencoding = wxMacGetSystemEncFromFontEnc( enc ) ;
TextEncodingBase unicode = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicode16BitFormat) ; if( !CFStringIsEncodingAvailable( cfencoding ) )
OSStatus status = TECCreateConverter(&converter,code,unicode); return NULL;
char s[2] ;
s[1] = 0 ; memset( gMacEncodings[i] , 0 , 128 * 2 );
ByteCount byteInLen, byteOutLen ; char s[2] = { 0 , 0 };
CFRange firstchar = CFRangeMake( 0, 1 );
for( unsigned char c = 255 ; c >= 128 ; --c ) for( unsigned char c = 255 ; c >= 128 ; --c )
{ {
s[0] = c ; s[0] = c ;
status = TECConvertText(converter, (ConstTextPtr) &s , 1, &byteInLen, wxCFStringRef cfref( CFStringCreateWithCStringNoCopy( NULL, s, cfencoding , kCFAllocatorNull ) );
(TextPtr) &gMacEncodings[i][c-128] , 2, &byteOutLen); CFStringGetCharacters( cfref, firstchar, (UniChar*) &gMacEncodings[i][c-128] );
} }
status = TECDisposeConverter(converter);
gMacEncodingsInited[i]=true; gMacEncodingsInited[i]=true;
} }
return gMacEncodings[i] ; return gMacEncodings[i] ;