mac encodings support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25312 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -48,40 +48,24 @@ typedef char tchar;
|
||||
#include "TextCommon.h"
|
||||
#include "TextEncodingConverter.h"
|
||||
|
||||
#include "wx/fontutil.h"
|
||||
#include "wx/mac/private.h" // includes mac headers
|
||||
|
||||
typedef struct {
|
||||
wxFontEncoding enc ;
|
||||
TextEncodingBase mac ;
|
||||
} MacCP ;
|
||||
|
||||
MacCP gMacCodePages[] =
|
||||
{
|
||||
wxFONTENCODING_MACROMAN, kTextEncodingMacRoman,
|
||||
wxFONTENCODING_MACCENTRALEUR, kTextEncodingMacCentralEurRoman,
|
||||
wxFONTENCODING_MACHEBREW, kTextEncodingMacHebrew,
|
||||
wxFONTENCODING_MACGREEK, kTextEncodingMacGreek,
|
||||
wxFONTENCODING_MACARABIC, kTextEncodingMacArabic,
|
||||
wxFONTENCODING_MACTURKISH, kTextEncodingMacTurkish,
|
||||
wxFONTENCODING_MACCYRILLIC, kTextEncodingMacCyrillic,
|
||||
} ;
|
||||
|
||||
wxUint16 gMacEncodings[WXSIZEOF(gMacCodePages)][128] ;
|
||||
bool gMacEncodingsInited[WXSIZEOF(gMacCodePages)] ;
|
||||
wxUint16 gMacEncodings[wxFONTENCODING_MACMAX-wxFONTENCODING_MACMIN+1][128] ;
|
||||
bool gMacEncodingsInited[wxFONTENCODING_MACMAX-wxFONTENCODING_MACMIN+1] ;
|
||||
|
||||
#endif
|
||||
|
||||
static wxUint16* LINKAGEMODE GetEncTable(wxFontEncoding enc)
|
||||
{
|
||||
#ifdef __WXMAC__
|
||||
for (int i = 0 ; i < WXSIZEOF(gMacCodePages) ; ++i )
|
||||
{
|
||||
if ( gMacCodePages[i].enc == enc )
|
||||
if( enc >= wxFONTENCODING_MACMIN && enc <= wxFONTENCODING_MACMAX )
|
||||
{
|
||||
int i = enc-wxFONTENCODING_MACMIN ;
|
||||
if ( gMacEncodingsInited[i] == false )
|
||||
{
|
||||
TECObjectRef converter ;
|
||||
TextEncodingBase code = gMacCodePages[i].mac ;
|
||||
TextEncodingBase code = wxMacGetSystemEncFromFontEnc( enc ) ;
|
||||
TextEncodingBase unicode = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicode16BitFormat) ;
|
||||
OSStatus status = TECCreateConverter(&converter,code,unicode);
|
||||
char s[2] ;
|
||||
@@ -98,7 +82,6 @@ static wxUint16* LINKAGEMODE GetEncTable(wxFontEncoding enc)
|
||||
}
|
||||
return gMacEncodings[i] ;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
for (int i = 0; encodings_list[i].table != NULL; i++)
|
||||
|
Reference in New Issue
Block a user