Various changes needed to get up to date with current CVS

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24023 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-09-30 21:04:25 +00:00
parent 3c623cf7d9
commit 7ea515abfb
10 changed files with 276 additions and 121 deletions

View File

@@ -131,26 +131,25 @@ enum wxFontEncoding
wxFONTENCODING_UTF7, // UTF-7 Unicode encoding
wxFONTENCODING_UTF8, // UTF-8 Unicode encoding
wxFONTENCODING_UTF16, // UTF-16 Unicode encoding
wxFONTENCODING_EUC_JP, // Extended Unix Codepage for Japanese
wxFONTENCODING_UTF16BE, // UTF-16 Big Endian Unicode encoding
wxFONTENCODING_UTF16LE, // UTF-16 Little Endian Unicode encoding
wxFONTENCODING_UTF32, // UTF-32 Unicode encoding
wxFONTENCODING_UTF32BE, // UTF-32 Big Endian Unicode encoding
wxFONTENCODING_UTF32LE, // UTF-32 Little Endian Unicode encoding
wxFONTENCODING_MAX,
// Far Eastern encodings
// Chinese
wxFONTENCODING_GB2312 = wxFONTENCODING_CP936, // Simplified Chinese
wxFONTENCODING_BIG5 = wxFONTENCODING_CP950, // Traditional Chinese
wxFONTENCODING_GB2312, // Simplified Chinese
wxFONTENCODING_BIG5, // 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_SHIFT_JIS, // Shift JIS
wxFONTENCODING_UNICODE, // Unicode (for wxEncodingConverter only)
wxFONTENCODING_MAX
// Aliases
wxFONTENCODING_UTF16,
wxFONTENCODING_UTF32,
wxFONTENCODING_UNICODE,
};