X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2e907fab47d506f5c8096b4a7675d9bd4216320e..9918d4d5c1604d8bdd6cd04a3b163ae64eb9d447:/include/wx/fontenc.h?ds=inline diff --git a/include/wx/fontenc.h b/include/wx/fontenc.h index 4494b6dea0..73c832a771 100644 --- a/include/wx/fontenc.h +++ b/include/wx/fontenc.h @@ -54,6 +54,10 @@ enum wxFontEncoding wxFONTENCODING_CP866, // and another one // and for Windows wxFONTENCODING_CP874, // WinThai + wxFONTENCODING_CP932, // Japanese (shift-JIS) + wxFONTENCODING_CP936, // Chinese simplified (GB) + wxFONTENCODING_CP949, // Korean (Hangul charset) + wxFONTENCODING_CP950, // Chinese (traditional - Big5) wxFONTENCODING_CP1250, // WinLatin2 wxFONTENCODING_CP1251, // WinCyrillic wxFONTENCODING_CP1252, // WinLatin1 @@ -63,7 +67,10 @@ enum wxFontEncoding wxFONTENCODING_CP1256, // WinArabic wxFONTENCODING_CP1257, // WinBaltic (same as Latin 7) wxFONTENCODING_CP12_MAX, - + + wxFONTENCODING_UTF7, // UTF-7 Unicode encoding + wxFONTENCODING_UTF8, // UTF-8 Unicode encoding + wxFONTENCODING_UNICODE, // Unicode - currently used only by // wxEncodingConverter class @@ -96,12 +103,18 @@ struct WXDLLEXPORT wxNativeEncodingInfo wxFontEncoding encoding; // so that we know what this struct represents #if defined(__WXMSW__) || defined(__WXPM__) || defined(__WXMAC__) - wxNativeEncodingInfo() { charset = 0; /* ANSI_CHARSET */ } + wxNativeEncodingInfo() + : facename() + , encoding(wxFONTENCODING_SYSTEM) + , charset(0) /* ANSI_CHARSET */ + { } int charset; #elif defined(_WX_X_FONTLIKE) wxString xregistry, xencoding; +#elif defined(__WXMGL__) + int mglEncoding; #else #error "Unsupported toolkit" #endif