X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d84afea9d1ec41ee4e2ebb3bf6b87926cf5f04d1..4caf847c87568a6bb1defcc5fc3a9b5db37680b4:/include/wx/fontenc.h?ds=inline diff --git a/include/wx/fontenc.h b/include/wx/fontenc.h index 73c832a771..1f2a667b24 100644 --- a/include/wx/fontenc.h +++ b/include/wx/fontenc.h @@ -6,7 +6,7 @@ // Created: 29.03.00 // RCS-ID: $Id$ // Copyright: (c) Vadim Zeitlin -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_FONTENC_H_ @@ -71,8 +71,17 @@ enum wxFontEncoding wxFONTENCODING_UTF7, // UTF-7 Unicode encoding wxFONTENCODING_UTF8, // UTF-8 Unicode encoding - wxFONTENCODING_UNICODE, // Unicode - currently used only by - // wxEncodingConverter class + // Far Eastern encodings + // Chinese + wxFONTENCODING_GB2312 = wxFONTENCODING_CP936, // Simplified Chinese + wxFONTENCODING_BIG5 = wxFONTENCODING_CP950, // Traditional Chinese + + // Japanese (see http://zsigri.tripod.com/fontboard/cjk/jis.html) + wxFONTENCODING_SHIFT_JIS = wxFONTENCODING_CP932, // Shift JIS + wxFONTENCODING_EUC_JP = wxFONTENCODING_UTF8 + 1, // Extended Unix Codepage + // for Japanese + + wxFONTENCODING_UNICODE, // Unicode (for wxEncodingConverter only) wxFONTENCODING_MAX }; @@ -102,7 +111,7 @@ struct WXDLLEXPORT wxNativeEncodingInfo wxString facename; // may be empty meaning "any" wxFontEncoding encoding; // so that we know what this struct represents -#if defined(__WXMSW__) || defined(__WXPM__) || defined(__WXMAC__) +#if defined(__WXMSW__) || defined(__WXPM__) || defined(__WXMAC__) || defined(__WXCOCOA__) // FIXME: __WXCOCOA__ wxNativeEncodingInfo() : facename() , encoding(wxFONTENCODING_SYSTEM) @@ -113,6 +122,9 @@ struct WXDLLEXPORT wxNativeEncodingInfo #elif defined(_WX_X_FONTLIKE) wxString xregistry, xencoding; +#elif defined(__WXGTK20__) + // No way to specify this in Pango as this + // seems to be handled internally. #elif defined(__WXMGL__) int mglEncoding; #else