X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d84afea9d1ec41ee4e2ebb3bf6b87926cf5f04d1..dc259b792613550edda31cc6202b42e172e2a240:/include/wx/fontenc.h diff --git a/include/wx/fontenc.h b/include/wx/fontenc.h index 73c832a771..afa99f08f1 100644 --- a/include/wx/fontenc.h +++ b/include/wx/fontenc.h @@ -71,6 +71,15 @@ enum wxFontEncoding wxFONTENCODING_UTF7, // UTF-7 Unicode encoding wxFONTENCODING_UTF8, // UTF-8 Unicode encoding + // 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, // Extended Unix Codepage for Japanese + wxFONTENCODING_UNICODE, // Unicode - currently used only by // wxEncodingConverter class @@ -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