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

pure CF code

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54112 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2008-06-11 16:23:57 +00:00
parent 0d535fda6e
commit cb40fa312e
1 changed files with 176 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

349
src/mac/corefoundation/cfstring.cpp
View File

@@ -22,7 +22,7 @@
#include "wx/mac/corefoundation/cfstring.h" #include "wx/mac/corefoundation/cfstring.h"
#include <CoreServices/CoreServices.h> #include <CoreFoundation/CoreFoundation.h>
void wxMacConvertNewlines13To10( char * data ) void wxMacConvertNewlines13To10( char * data )
{ {
@@ -59,7 +59,7 @@ void wxMacConvertNewlines10To13( wxString * data )
wxUint32 wxMacGetSystemEncFromFontEnc(wxFontEncoding encoding) wxUint32 wxMacGetSystemEncFromFontEnc(wxFontEncoding encoding)
{ {
TextEncodingBase enc = 0 ; CFStringEncoding enc = 0 ;
if ( encoding == wxFONTENCODING_DEFAULT ) if ( encoding == wxFONTENCODING_DEFAULT )
{ {
#if wxUSE_GUI #if wxUSE_GUI
@@ -77,50 +77,50 @@ wxUint32 wxMacGetSystemEncFromFontEnc(wxFontEncoding encoding)
switch( encoding) switch( encoding)
{ {
case wxFONTENCODING_ISO8859_1 : case wxFONTENCODING_ISO8859_1 :
enc = kTextEncodingISOLatin1 ; enc = kCFStringEncodingISOLatin1 ;
break ; break ;
case wxFONTENCODING_ISO8859_2 : case wxFONTENCODING_ISO8859_2 :
enc = kTextEncodingISOLatin2; enc = kCFStringEncodingISOLatin2;
break ; break ;
case wxFONTENCODING_ISO8859_3 : case wxFONTENCODING_ISO8859_3 :
enc = kTextEncodingISOLatin3 ; enc = kCFStringEncodingISOLatin3 ;
break ; break ;
case wxFONTENCODING_ISO8859_4 : case wxFONTENCODING_ISO8859_4 :
enc = kTextEncodingISOLatin4; enc = kCFStringEncodingISOLatin4;
break ; break ;
case wxFONTENCODING_ISO8859_5 : case wxFONTENCODING_ISO8859_5 :
enc = kTextEncodingISOLatinCyrillic; enc = kCFStringEncodingISOLatinCyrillic;
break ; break ;
case wxFONTENCODING_ISO8859_6 : case wxFONTENCODING_ISO8859_6 :
enc = kTextEncodingISOLatinArabic; enc = kCFStringEncodingISOLatinArabic;
break ; break ;
case wxFONTENCODING_ISO8859_7 : case wxFONTENCODING_ISO8859_7 :
enc = kTextEncodingISOLatinGreek; enc = kCFStringEncodingISOLatinGreek;
break ; break ;
case wxFONTENCODING_ISO8859_8 : case wxFONTENCODING_ISO8859_8 :
enc = kTextEncodingISOLatinHebrew; enc = kCFStringEncodingISOLatinHebrew;
break ; break ;
case wxFONTENCODING_ISO8859_9 : case wxFONTENCODING_ISO8859_9 :
enc = kTextEncodingISOLatin5; enc = kCFStringEncodingISOLatin5;
break ; break ;
case wxFONTENCODING_ISO8859_10 : case wxFONTENCODING_ISO8859_10 :
enc = kTextEncodingISOLatin6; enc = kCFStringEncodingISOLatin6;
break ; break ;
case wxFONTENCODING_ISO8859_13 : case wxFONTENCODING_ISO8859_13 :
enc = kTextEncodingISOLatin7; enc = kCFStringEncodingISOLatin7;
break ; break ;
case wxFONTENCODING_ISO8859_14 : case wxFONTENCODING_ISO8859_14 :
enc = kTextEncodingISOLatin8; enc = kCFStringEncodingISOLatin8;
break ; break ;
case wxFONTENCODING_ISO8859_15 : case wxFONTENCODING_ISO8859_15 :
enc = kTextEncodingISOLatin9; enc = kCFStringEncodingISOLatin9;
break ; break ;
case wxFONTENCODING_KOI8 : case wxFONTENCODING_KOI8 :
enc = kTextEncodingKOI8_R; enc = kCFStringEncodingKOI8_R;
break ; break ;
case wxFONTENCODING_ALTERNATIVE : // MS-DOS CP866 case wxFONTENCODING_ALTERNATIVE : // MS-DOS CP866
enc = kTextEncodingDOSRussian; enc = kCFStringEncodingDOSRussian;
break ; break ;
/* /*
case wxFONTENCODING_BULGARIAN : case wxFONTENCODING_BULGARIAN :
@@ -128,202 +128,203 @@ wxUint32 wxMacGetSystemEncFromFontEnc(wxFontEncoding encoding)
break ; break ;
*/ */
case wxFONTENCODING_CP437 : case wxFONTENCODING_CP437 :
enc =kTextEncodingDOSLatinUS ; enc =kCFStringEncodingDOSLatinUS ;
break ; break ;
case wxFONTENCODING_CP850 : case wxFONTENCODING_CP850 :
enc = kTextEncodingDOSLatin1; enc = kCFStringEncodingDOSLatin1;
break ; break ;
case wxFONTENCODING_CP852 : case wxFONTENCODING_CP852 :
enc = kTextEncodingDOSLatin2; enc = kCFStringEncodingDOSLatin2;
break ; break ;
case wxFONTENCODING_CP855 : case wxFONTENCODING_CP855 :
enc = kTextEncodingDOSCyrillic; enc = kCFStringEncodingDOSCyrillic;
break ; break ;
case wxFONTENCODING_CP866 : case wxFONTENCODING_CP866 :
enc =kTextEncodingDOSRussian ; enc =kCFStringEncodingDOSRussian ;
break ; break ;
case wxFONTENCODING_CP874 : case wxFONTENCODING_CP874 :
enc = kTextEncodingDOSThai; enc = kCFStringEncodingDOSThai;
break ; break ;
case wxFONTENCODING_CP932 : case wxFONTENCODING_CP932 :
enc = kTextEncodingDOSJapanese; enc = kCFStringEncodingDOSJapanese;
break ; break ;
case wxFONTENCODING_CP936 : case wxFONTENCODING_CP936 :
enc = kTextEncodingDOSChineseSimplif ; enc = kCFStringEncodingDOSChineseSimplif ;
break ; break ;
case wxFONTENCODING_CP949 : case wxFONTENCODING_CP949 :
enc = kTextEncodingDOSKorean; enc = kCFStringEncodingDOSKorean;
break ; break ;
case wxFONTENCODING_CP950 : case wxFONTENCODING_CP950 :
enc = kTextEncodingDOSChineseTrad; enc = kCFStringEncodingDOSChineseTrad;
break ; break ;
case wxFONTENCODING_CP1250 : case wxFONTENCODING_CP1250 :
enc = kTextEncodingWindowsLatin2; enc = kCFStringEncodingWindowsLatin2;
break ; break ;
case wxFONTENCODING_CP1251 : case wxFONTENCODING_CP1251 :
enc =kTextEncodingWindowsCyrillic ; enc =kCFStringEncodingWindowsCyrillic ;
break ; break ;
case wxFONTENCODING_CP1252 : case wxFONTENCODING_CP1252 :
enc =kTextEncodingWindowsLatin1 ; enc =kCFStringEncodingWindowsLatin1 ;
break ; break ;
case wxFONTENCODING_CP1253 : case wxFONTENCODING_CP1253 :
enc = kTextEncodingWindowsGreek; enc = kCFStringEncodingWindowsGreek;
break ; break ;
case wxFONTENCODING_CP1254 : case wxFONTENCODING_CP1254 :
enc = kTextEncodingWindowsLatin5; enc = kCFStringEncodingWindowsLatin5;
break ; break ;
case wxFONTENCODING_CP1255 : case wxFONTENCODING_CP1255 :
enc =kTextEncodingWindowsHebrew ; enc =kCFStringEncodingWindowsHebrew ;
break ; break ;
case wxFONTENCODING_CP1256 : case wxFONTENCODING_CP1256 :
enc =kTextEncodingWindowsArabic ; enc =kCFStringEncodingWindowsArabic ;
break ; break ;
case wxFONTENCODING_CP1257 : case wxFONTENCODING_CP1257 :
enc = kTextEncodingWindowsBalticRim; enc = kCFStringEncodingWindowsBalticRim;
break ; break ;
#if 0
case wxFONTENCODING_UTF7 : case wxFONTENCODING_UTF7 :
enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicodeUTF7Format) ; enc = CreateTextEncoding(kCFStringEncodingUnicodeDefault,0,kUnicodeUTF7Format) ;
#endif
break ; break ;
case wxFONTENCODING_UTF8 : case wxFONTENCODING_UTF8 :
enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicodeUTF8Format) ; enc = kCFStringEncodingUTF8;
break ; break ;
case wxFONTENCODING_EUC_JP : case wxFONTENCODING_EUC_JP :
enc = kTextEncodingEUC_JP; enc = kCFStringEncodingEUC_JP;
break ; break ;
case wxFONTENCODING_UTF16BE : case wxFONTENCODING_UTF16BE :
enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicode16BitFormat) ; enc = kCFStringEncodingUTF16BE;
break ; break ;
case wxFONTENCODING_UTF16LE : case wxFONTENCODING_UTF16LE :
enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicode16BitFormat) ; enc = kCFStringEncodingUTF16LE;
break ; break ;
case wxFONTENCODING_UTF32BE : case wxFONTENCODING_UTF32BE :
enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicode32BitFormat) ; enc = kCFStringEncodingUTF32BE;
break ; break ;
case wxFONTENCODING_UTF32LE : case wxFONTENCODING_UTF32LE :
enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicode32BitFormat) ; enc = kCFStringEncodingUTF32LE;
break ; break ;
case wxFONTENCODING_MACROMAN : case wxFONTENCODING_MACROMAN :
enc = kTextEncodingMacRoman ; enc = kCFStringEncodingMacRoman ;
break ; break ;
case wxFONTENCODING_MACJAPANESE : case wxFONTENCODING_MACJAPANESE :
enc = kTextEncodingMacJapanese ; enc = kCFStringEncodingMacJapanese ;
break ; break ;
case wxFONTENCODING_MACCHINESETRAD : case wxFONTENCODING_MACCHINESETRAD :
enc = kTextEncodingMacChineseTrad ; enc = kCFStringEncodingMacChineseTrad ;
break ; break ;
case wxFONTENCODING_MACKOREAN : case wxFONTENCODING_MACKOREAN :
enc = kTextEncodingMacKorean ; enc = kCFStringEncodingMacKorean ;
break ; break ;
case wxFONTENCODING_MACARABIC : case wxFONTENCODING_MACARABIC :
enc = kTextEncodingMacArabic ; enc = kCFStringEncodingMacArabic ;
break ; break ;
case wxFONTENCODING_MACHEBREW : case wxFONTENCODING_MACHEBREW :
enc = kTextEncodingMacHebrew ; enc = kCFStringEncodingMacHebrew ;
break ; break ;
case wxFONTENCODING_MACGREEK : case wxFONTENCODING_MACGREEK :
enc = kTextEncodingMacGreek ; enc = kCFStringEncodingMacGreek ;
break ; break ;
case wxFONTENCODING_MACCYRILLIC : case wxFONTENCODING_MACCYRILLIC :
enc = kTextEncodingMacCyrillic ; enc = kCFStringEncodingMacCyrillic ;
break ; break ;
case wxFONTENCODING_MACDEVANAGARI : case wxFONTENCODING_MACDEVANAGARI :
enc = kTextEncodingMacDevanagari ; enc = kCFStringEncodingMacDevanagari ;
break ; break ;
case wxFONTENCODING_MACGURMUKHI : case wxFONTENCODING_MACGURMUKHI :
enc = kTextEncodingMacGurmukhi ; enc = kCFStringEncodingMacGurmukhi ;
break ; break ;
case wxFONTENCODING_MACGUJARATI : case wxFONTENCODING_MACGUJARATI :
enc = kTextEncodingMacGujarati ; enc = kCFStringEncodingMacGujarati ;
break ; break ;
case wxFONTENCODING_MACORIYA : case wxFONTENCODING_MACORIYA :
enc = kTextEncodingMacOriya ; enc = kCFStringEncodingMacOriya ;
break ; break ;
case wxFONTENCODING_MACBENGALI : case wxFONTENCODING_MACBENGALI :
enc = kTextEncodingMacBengali ; enc = kCFStringEncodingMacBengali ;
break ; break ;
case wxFONTENCODING_MACTAMIL : case wxFONTENCODING_MACTAMIL :
enc = kTextEncodingMacTamil ; enc = kCFStringEncodingMacTamil ;
break ; break ;
case wxFONTENCODING_MACTELUGU : case wxFONTENCODING_MACTELUGU :
enc = kTextEncodingMacTelugu ; enc = kCFStringEncodingMacTelugu ;
break ; break ;
case wxFONTENCODING_MACKANNADA : case wxFONTENCODING_MACKANNADA :
enc = kTextEncodingMacKannada ; enc = kCFStringEncodingMacKannada ;
break ; break ;
case wxFONTENCODING_MACMALAJALAM : case wxFONTENCODING_MACMALAJALAM :
enc = kTextEncodingMacMalayalam ; enc = kCFStringEncodingMacMalayalam ;
break ; break ;
case wxFONTENCODING_MACSINHALESE : case wxFONTENCODING_MACSINHALESE :
enc = kTextEncodingMacSinhalese ; enc = kCFStringEncodingMacSinhalese ;
break ; break ;
case wxFONTENCODING_MACBURMESE : case wxFONTENCODING_MACBURMESE :
enc = kTextEncodingMacBurmese ; enc = kCFStringEncodingMacBurmese ;
break ; break ;
case wxFONTENCODING_MACKHMER : case wxFONTENCODING_MACKHMER :
enc = kTextEncodingMacKhmer ; enc = kCFStringEncodingMacKhmer ;
break ; break ;
case wxFONTENCODING_MACTHAI : case wxFONTENCODING_MACTHAI :
enc = kTextEncodingMacThai ; enc = kCFStringEncodingMacThai ;
break ; break ;
case wxFONTENCODING_MACLAOTIAN : case wxFONTENCODING_MACLAOTIAN :
enc = kTextEncodingMacLaotian ; enc = kCFStringEncodingMacLaotian ;
break ; break ;
case wxFONTENCODING_MACGEORGIAN : case wxFONTENCODING_MACGEORGIAN :
enc = kTextEncodingMacGeorgian ; enc = kCFStringEncodingMacGeorgian ;
break ; break ;
case wxFONTENCODING_MACARMENIAN : case wxFONTENCODING_MACARMENIAN :
enc = kTextEncodingMacArmenian ; enc = kCFStringEncodingMacArmenian ;
break ; break ;
case wxFONTENCODING_MACCHINESESIMP : case wxFONTENCODING_MACCHINESESIMP :
enc = kTextEncodingMacChineseSimp ; enc = kCFStringEncodingMacChineseSimp ;
break ; break ;
case wxFONTENCODING_MACTIBETAN : case wxFONTENCODING_MACTIBETAN :
enc = kTextEncodingMacTibetan ; enc = kCFStringEncodingMacTibetan ;
break ; break ;
case wxFONTENCODING_MACMONGOLIAN : case wxFONTENCODING_MACMONGOLIAN :
enc = kTextEncodingMacMongolian ; enc = kCFStringEncodingMacMongolian ;
break ; break ;
case wxFONTENCODING_MACETHIOPIC : case wxFONTENCODING_MACETHIOPIC :
enc = kTextEncodingMacEthiopic ; enc = kCFStringEncodingMacEthiopic ;
break ; break ;
case wxFONTENCODING_MACCENTRALEUR : case wxFONTENCODING_MACCENTRALEUR :
enc = kTextEncodingMacCentralEurRoman ; enc = kCFStringEncodingMacCentralEurRoman ;
break ; break ;
case wxFONTENCODING_MACVIATNAMESE : case wxFONTENCODING_MACVIATNAMESE :
enc = kTextEncodingMacVietnamese ; enc = kCFStringEncodingMacVietnamese ;
break ; break ;
case wxFONTENCODING_MACARABICEXT : case wxFONTENCODING_MACARABICEXT :
enc = kTextEncodingMacExtArabic ; enc = kCFStringEncodingMacExtArabic ;
break ; break ;
case wxFONTENCODING_MACSYMBOL : case wxFONTENCODING_MACSYMBOL :
enc = kTextEncodingMacSymbol ; enc = kCFStringEncodingMacSymbol ;
break ; break ;
case wxFONTENCODING_MACDINGBATS : case wxFONTENCODING_MACDINGBATS :
enc = kTextEncodingMacDingbats ; enc = kCFStringEncodingMacDingbats ;
break ; break ;
case wxFONTENCODING_MACTURKISH : case wxFONTENCODING_MACTURKISH :
enc = kTextEncodingMacTurkish ; enc = kCFStringEncodingMacTurkish ;
break ; break ;
case wxFONTENCODING_MACCROATIAN : case wxFONTENCODING_MACCROATIAN :
enc = kTextEncodingMacCroatian ; enc = kCFStringEncodingMacCroatian ;
break ; break ;
case wxFONTENCODING_MACICELANDIC : case wxFONTENCODING_MACICELANDIC :
enc = kTextEncodingMacIcelandic ; enc = kCFStringEncodingMacIcelandic ;
break ; break ;
case wxFONTENCODING_MACROMANIAN : case wxFONTENCODING_MACROMANIAN :
enc = kTextEncodingMacRomanian ; enc = kCFStringEncodingMacRomanian ;
break ; break ;
case wxFONTENCODING_MACCELTIC : case wxFONTENCODING_MACCELTIC :
enc = kTextEncodingMacCeltic ; enc = kCFStringEncodingMacCeltic ;
break ; break ;
case wxFONTENCODING_MACGAELIC : case wxFONTENCODING_MACGAELIC :
enc = kTextEncodingMacGaelic ; enc = kCFStringEncodingMacGaelic ;
break ; break ;
case wxFONTENCODING_MACKEYBOARD : case wxFONTENCODING_MACKEYBOARD :
enc = kTextEncodingMacKeyboardGlyphs ; enc = 41; /* kTextEncodingMacKeyboardGlyphs ; */
break ; break ;
default : // to make gcc happy default : // to make gcc happy
break ; break ;
@@ -337,47 +338,47 @@ wxFontEncoding wxMacGetFontEncFromSystemEnc(wxUint32 encoding)
switch( encoding) switch( encoding)
{ {
case kTextEncodingISOLatin1 : case kCFStringEncodingISOLatin1 :
enc = wxFONTENCODING_ISO8859_1 ; enc = wxFONTENCODING_ISO8859_1 ;
break ; break ;
case kTextEncodingISOLatin2 : case kCFStringEncodingISOLatin2 :
enc = wxFONTENCODING_ISO8859_2; enc = wxFONTENCODING_ISO8859_2;
break ; break ;
case kTextEncodingISOLatin3 : case kCFStringEncodingISOLatin3 :
enc = wxFONTENCODING_ISO8859_3 ; enc = wxFONTENCODING_ISO8859_3 ;
break ; break ;
case kTextEncodingISOLatin4 : case kCFStringEncodingISOLatin4 :
enc = wxFONTENCODING_ISO8859_4; enc = wxFONTENCODING_ISO8859_4;
break ; break ;
case kTextEncodingISOLatinCyrillic : case kCFStringEncodingISOLatinCyrillic :
enc = wxFONTENCODING_ISO8859_5; enc = wxFONTENCODING_ISO8859_5;
break ; break ;
case kTextEncodingISOLatinArabic : case kCFStringEncodingISOLatinArabic :
enc = wxFONTENCODING_ISO8859_6; enc = wxFONTENCODING_ISO8859_6;
break ; break ;
case kTextEncodingISOLatinGreek : case kCFStringEncodingISOLatinGreek :
enc = wxFONTENCODING_ISO8859_7; enc = wxFONTENCODING_ISO8859_7;
break ; break ;
case kTextEncodingISOLatinHebrew : case kCFStringEncodingISOLatinHebrew :
enc = wxFONTENCODING_ISO8859_8; enc = wxFONTENCODING_ISO8859_8;
break ; break ;
case kTextEncodingISOLatin5 : case kCFStringEncodingISOLatin5 :
enc = wxFONTENCODING_ISO8859_9; enc = wxFONTENCODING_ISO8859_9;
break ; break ;
case kTextEncodingISOLatin6 : case kCFStringEncodingISOLatin6 :
enc = wxFONTENCODING_ISO8859_10; enc = wxFONTENCODING_ISO8859_10;
break ; break ;
case kTextEncodingISOLatin7 : case kCFStringEncodingISOLatin7 :
enc = wxFONTENCODING_ISO8859_13; enc = wxFONTENCODING_ISO8859_13;
break ; break ;
case kTextEncodingISOLatin8 : case kCFStringEncodingISOLatin8 :
enc = wxFONTENCODING_ISO8859_14; enc = wxFONTENCODING_ISO8859_14;
break ; break ;
case kTextEncodingISOLatin9 : case kCFStringEncodingISOLatin9 :
enc =wxFONTENCODING_ISO8859_15 ; enc =wxFONTENCODING_ISO8859_15 ;
break ; break ;
case kTextEncodingKOI8_R : case kCFStringEncodingKOI8_R :
enc = wxFONTENCODING_KOI8; enc = wxFONTENCODING_KOI8;
break ; break ;
/* /*
@@ -385,202 +386,204 @@ wxFontEncoding wxMacGetFontEncFromSystemEnc(wxUint32 encoding)
enc = wxFONTENCODING_BULGARIAN; enc = wxFONTENCODING_BULGARIAN;
break ; break ;
*/ */
case kTextEncodingDOSLatinUS : case kCFStringEncodingDOSLatinUS :
enc = wxFONTENCODING_CP437; enc = wxFONTENCODING_CP437;
break ; break ;
case kTextEncodingDOSLatin1 : case kCFStringEncodingDOSLatin1 :
enc = wxFONTENCODING_CP850; enc = wxFONTENCODING_CP850;
break ; break ;
case kTextEncodingDOSLatin2 : case kCFStringEncodingDOSLatin2 :
enc =wxFONTENCODING_CP852 ; enc =wxFONTENCODING_CP852 ;
break ; break ;
case kTextEncodingDOSCyrillic : case kCFStringEncodingDOSCyrillic :
enc = wxFONTENCODING_CP855; enc = wxFONTENCODING_CP855;
break ; break ;
case kTextEncodingDOSRussian : case kCFStringEncodingDOSRussian :
enc = wxFONTENCODING_CP866; enc = wxFONTENCODING_CP866;
break ; break ;
case kTextEncodingDOSThai : case kCFStringEncodingDOSThai :
enc =wxFONTENCODING_CP874 ; enc =wxFONTENCODING_CP874 ;
break ; break ;
case kTextEncodingDOSJapanese : case kCFStringEncodingDOSJapanese :
enc = wxFONTENCODING_CP932; enc = wxFONTENCODING_CP932;
break ; break ;
case kTextEncodingDOSChineseSimplif : case kCFStringEncodingDOSChineseSimplif :
enc = wxFONTENCODING_CP936; enc = wxFONTENCODING_CP936;
break ; break ;
case kTextEncodingDOSKorean : case kCFStringEncodingDOSKorean :
enc = wxFONTENCODING_CP949; enc = wxFONTENCODING_CP949;
break ; break ;
case kTextEncodingDOSChineseTrad : case kCFStringEncodingDOSChineseTrad :
enc = wxFONTENCODING_CP950; enc = wxFONTENCODING_CP950;
break ; break ;
case kTextEncodingWindowsLatin2 : case kCFStringEncodingWindowsLatin2 :
enc = wxFONTENCODING_CP1250; enc = wxFONTENCODING_CP1250;
break ; break ;
case kTextEncodingWindowsCyrillic : case kCFStringEncodingWindowsCyrillic :
enc = wxFONTENCODING_CP1251; enc = wxFONTENCODING_CP1251;
break ; break ;
case kTextEncodingWindowsLatin1 : case kCFStringEncodingWindowsLatin1 :
enc = wxFONTENCODING_CP1252; enc = wxFONTENCODING_CP1252;
break ; break ;
case kTextEncodingWindowsGreek : case kCFStringEncodingWindowsGreek :
enc = wxFONTENCODING_CP1253; enc = wxFONTENCODING_CP1253;
break ; break ;
case kTextEncodingWindowsLatin5 : case kCFStringEncodingWindowsLatin5 :
enc = wxFONTENCODING_CP1254; enc = wxFONTENCODING_CP1254;
break ; break ;
case kTextEncodingWindowsHebrew : case kCFStringEncodingWindowsHebrew :
enc = wxFONTENCODING_CP1255; enc = wxFONTENCODING_CP1255;
break ; break ;
case kTextEncodingWindowsArabic : case kCFStringEncodingWindowsArabic :
enc = wxFONTENCODING_CP1256; enc = wxFONTENCODING_CP1256;
break ; break ;
case kTextEncodingWindowsBalticRim : case kCFStringEncodingWindowsBalticRim :
enc =wxFONTENCODING_CP1257 ; enc =wxFONTENCODING_CP1257 ;
break ; break ;
case kTextEncodingEUC_JP : case kCFStringEncodingEUC_JP :
enc = wxFONTENCODING_EUC_JP; enc = wxFONTENCODING_EUC_JP;
break ; break ;
case kCFStringEncodingUTF8 :
enc = wxFONTENCODING_UTF8;
break ;
case kCFStringEncodingUTF16BE :
enc = wxFONTENCODING_UTF16BE;
break ;
case kCFStringEncodingUTF16LE :
enc = wxFONTENCODING_UTF16LE;
break ;
case kCFStringEncodingUTF32BE :
enc = wxFONTENCODING_UTF32BE;
break ;
case kCFStringEncodingUTF32LE :
enc = wxFONTENCODING_UTF32LE;
break ;
#if 0 #if 0
case wxFONTENCODING_UTF7 : case wxFONTENCODING_UTF7 :
enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicodeUTF7Format) ; enc = CreateTextEncoding(kCFStringEncodingUnicodeDefault,0,kUnicodeUTF7Format) ;
break ;
case wxFONTENCODING_UTF8 :
enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicodeUTF8Format) ;
break ;
case wxFONTENCODING_UTF16BE :
enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicode16BitFormat) ;
break ;
case wxFONTENCODING_UTF16LE :
enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicode16BitFormat) ;
break ;
case wxFONTENCODING_UTF32BE :
enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicode32BitFormat) ;
break ;
case wxFONTENCODING_UTF32LE :
enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicode32BitFormat) ;
break ; break ;
#endif #endif
case kTextEncodingMacRoman : case kCFStringEncodingMacRoman :
enc = wxFONTENCODING_MACROMAN ; enc = wxFONTENCODING_MACROMAN ;
break ; break ;
case kTextEncodingMacJapanese : case kCFStringEncodingMacJapanese :
enc = wxFONTENCODING_MACJAPANESE ; enc = wxFONTENCODING_MACJAPANESE ;
break ; break ;
case kTextEncodingMacChineseTrad : case kCFStringEncodingMacChineseTrad :
enc = wxFONTENCODING_MACCHINESETRAD ; enc = wxFONTENCODING_MACCHINESETRAD ;
break ; break ;
case kTextEncodingMacKorean : case kCFStringEncodingMacKorean :
enc = wxFONTENCODING_MACKOREAN ; enc = wxFONTENCODING_MACKOREAN ;
break ; break ;
case kTextEncodingMacArabic : case kCFStringEncodingMacArabic :
enc =wxFONTENCODING_MACARABIC ; enc =wxFONTENCODING_MACARABIC ;
break ; break ;
case kTextEncodingMacHebrew : case kCFStringEncodingMacHebrew :
enc = wxFONTENCODING_MACHEBREW ; enc = wxFONTENCODING_MACHEBREW ;
break ; break ;
case kTextEncodingMacGreek : case kCFStringEncodingMacGreek :
enc = wxFONTENCODING_MACGREEK ; enc = wxFONTENCODING_MACGREEK ;
break ; break ;
case kTextEncodingMacCyrillic : case kCFStringEncodingMacCyrillic :
enc = wxFONTENCODING_MACCYRILLIC ; enc = wxFONTENCODING_MACCYRILLIC ;
break ; break ;
case kTextEncodingMacDevanagari : case kCFStringEncodingMacDevanagari :
enc = wxFONTENCODING_MACDEVANAGARI ; enc = wxFONTENCODING_MACDEVANAGARI ;
break ; break ;
case kTextEncodingMacGurmukhi : case kCFStringEncodingMacGurmukhi :
enc = wxFONTENCODING_MACGURMUKHI ; enc = wxFONTENCODING_MACGURMUKHI ;
break ; break ;
case kTextEncodingMacGujarati : case kCFStringEncodingMacGujarati :
enc = wxFONTENCODING_MACGUJARATI ; enc = wxFONTENCODING_MACGUJARATI ;
break ; break ;
case kTextEncodingMacOriya : case kCFStringEncodingMacOriya :
enc =wxFONTENCODING_MACORIYA ; enc =wxFONTENCODING_MACORIYA ;
break ; break ;
case kTextEncodingMacBengali : case kCFStringEncodingMacBengali :
enc =wxFONTENCODING_MACBENGALI ; enc =wxFONTENCODING_MACBENGALI ;
break ; break ;
case kTextEncodingMacTamil : case kCFStringEncodingMacTamil :
enc = wxFONTENCODING_MACTAMIL ; enc = wxFONTENCODING_MACTAMIL ;
break ; break ;
case kTextEncodingMacTelugu : case kCFStringEncodingMacTelugu :
enc = wxFONTENCODING_MACTELUGU ; enc = wxFONTENCODING_MACTELUGU ;
break ; break ;
case kTextEncodingMacKannada : case kCFStringEncodingMacKannada :
enc = wxFONTENCODING_MACKANNADA ; enc = wxFONTENCODING_MACKANNADA ;
break ; break ;
case kTextEncodingMacMalayalam : case kCFStringEncodingMacMalayalam :
enc = wxFONTENCODING_MACMALAJALAM ; enc = wxFONTENCODING_MACMALAJALAM ;
break ; break ;
case kTextEncodingMacSinhalese : case kCFStringEncodingMacSinhalese :
enc = wxFONTENCODING_MACSINHALESE ; enc = wxFONTENCODING_MACSINHALESE ;
break ; break ;
case kTextEncodingMacBurmese : case kCFStringEncodingMacBurmese :
enc = wxFONTENCODING_MACBURMESE ; enc = wxFONTENCODING_MACBURMESE ;
break ; break ;
case kTextEncodingMacKhmer : case kCFStringEncodingMacKhmer :
enc = wxFONTENCODING_MACKHMER ; enc = wxFONTENCODING_MACKHMER ;
break ; break ;
case kTextEncodingMacThai : case kCFStringEncodingMacThai :
enc = wxFONTENCODING_MACTHAI ; enc = wxFONTENCODING_MACTHAI ;
break ; break ;
case kTextEncodingMacLaotian : case kCFStringEncodingMacLaotian :
enc = wxFONTENCODING_MACLAOTIAN ; enc = wxFONTENCODING_MACLAOTIAN ;
break ; break ;
case kTextEncodingMacGeorgian : case kCFStringEncodingMacGeorgian :
enc = wxFONTENCODING_MACGEORGIAN ; enc = wxFONTENCODING_MACGEORGIAN ;
break ; break ;
case kTextEncodingMacArmenian : case kCFStringEncodingMacArmenian :
enc = wxFONTENCODING_MACARMENIAN ; enc = wxFONTENCODING_MACARMENIAN ;
break ; break ;
case kTextEncodingMacChineseSimp : case kCFStringEncodingMacChineseSimp :
enc = wxFONTENCODING_MACCHINESESIMP ; enc = wxFONTENCODING_MACCHINESESIMP ;
break ; break ;
case kTextEncodingMacTibetan : case kCFStringEncodingMacTibetan :
enc = wxFONTENCODING_MACTIBETAN ; enc = wxFONTENCODING_MACTIBETAN ;
break ; break ;
case kTextEncodingMacMongolian : case kCFStringEncodingMacMongolian :
enc = wxFONTENCODING_MACMONGOLIAN ; enc = wxFONTENCODING_MACMONGOLIAN ;
break ; break ;
case kTextEncodingMacEthiopic : case kCFStringEncodingMacEthiopic :
enc = wxFONTENCODING_MACETHIOPIC ; enc = wxFONTENCODING_MACETHIOPIC ;
break ; break ;
case kTextEncodingMacCentralEurRoman: case kCFStringEncodingMacCentralEurRoman:
enc = wxFONTENCODING_MACCENTRALEUR ; enc = wxFONTENCODING_MACCENTRALEUR ;
break ; break ;
case kTextEncodingMacVietnamese: case kCFStringEncodingMacVietnamese:
enc = wxFONTENCODING_MACVIATNAMESE ; enc = wxFONTENCODING_MACVIATNAMESE ;
break ; break ;
case kTextEncodingMacExtArabic : case kCFStringEncodingMacExtArabic :
enc = wxFONTENCODING_MACARABICEXT ; enc = wxFONTENCODING_MACARABICEXT ;
break ; break ;
case kTextEncodingMacSymbol : case kCFStringEncodingMacSymbol :
enc = wxFONTENCODING_MACSYMBOL ; enc = wxFONTENCODING_MACSYMBOL ;
break ; break ;
case kTextEncodingMacDingbats : case kCFStringEncodingMacDingbats :
enc = wxFONTENCODING_MACDINGBATS ; enc = wxFONTENCODING_MACDINGBATS ;
break ; break ;
case kTextEncodingMacTurkish : case kCFStringEncodingMacTurkish :
enc = wxFONTENCODING_MACTURKISH ; enc = wxFONTENCODING_MACTURKISH ;
break ; break ;
case kTextEncodingMacCroatian : case kCFStringEncodingMacCroatian :
enc = wxFONTENCODING_MACCROATIAN ; enc = wxFONTENCODING_MACCROATIAN ;
break ; break ;
case kTextEncodingMacIcelandic : case kCFStringEncodingMacIcelandic :
enc = wxFONTENCODING_MACICELANDIC ; enc = wxFONTENCODING_MACICELANDIC ;
break ; break ;
case kTextEncodingMacRomanian : case kCFStringEncodingMacRomanian :
enc = wxFONTENCODING_MACROMANIAN ; enc = wxFONTENCODING_MACROMANIAN ;
break ; break ;
case kTextEncodingMacCeltic : case kCFStringEncodingMacCeltic :
enc = wxFONTENCODING_MACCELTIC ; enc = wxFONTENCODING_MACCELTIC ;
break ; break ;
case kTextEncodingMacGaelic : case kCFStringEncodingMacGaelic :
enc = wxFONTENCODING_MACGAELIC ; enc = wxFONTENCODING_MACGAELIC ;
break ; break ;
case kTextEncodingMacKeyboardGlyphs : case 41 /* kTextEncodingMacKeyboardGlyphs */ :
enc = wxFONTENCODING_MACKEYBOARD ; enc = wxFONTENCODING_MACKEYBOARD ;
break ; break ;
} ; } ;
@@ -718,7 +721,7 @@ wxMacUniCharBuffer::~wxMacUniCharBuffer()
free( m_ubuf ) ; free( m_ubuf ) ;
} }
UniCharArrayPtr wxMacUniCharBuffer::GetBuffer() UniCharPtr wxMacUniCharBuffer::GetBuffer()
{ {
return m_ubuf ; return m_ubuf ;
} }