From d29e4f03d99f1dd6a457098bd207ff35f09f658f Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 31 Oct 2002 20:43:48 +0000 Subject: [PATCH] restored the old values of the wxFontEncoding enum elements and also made Chinese/Japanese encodings synonyms for the MS ones, not the new values git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17664 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/fontenc.h | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/include/wx/fontenc.h b/include/wx/fontenc.h index da99ca0d86..afa99f08f1 100644 --- a/include/wx/fontenc.h +++ b/include/wx/fontenc.h @@ -45,14 +45,6 @@ enum wxFontEncoding wxFONTENCODING_ALTERNATIVE, // same as MS-DOS CP866 wxFONTENCODING_BULGARIAN, // used under Linux in Bulgaria - // Chinese - wxFONTENCODING_GB2312, // Simplified Chinese (same as CP936) - wxFONTENCODING_BIG5, // Traditional Chinese (same as CP950) - - // Japanese (see http://zsigri.tripod.com/fontboard/cjk/jis.html) - wxFONTENCODING_SHIFT_JIS, // (same as CP932) - wxFONTENCODING_EUC_JP, // Extended Unix Codepage for Japanese - // what would we do without Microsoft? They have their own encodings // for DOS wxFONTENCODING_CP437, // original MS-DOS codepage @@ -79,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