From 3d4e20dd0baa3399b72b66a12ddcb0f898c43989 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 23 Jul 2010 23:32:40 +0000 Subject: [PATCH] Added wxFONTENCODING_EUC_KR alias for wxFONTENCODING_CP949. Although CP949 might not be exactly the same as EUC-KR it appears to be similar enough and having a more familiar name for it is helpful for people unfamiliar with Windows nomenclature. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65056 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/fontenc.h | 7 +++++-- interface/wx/font.h | 7 ++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/wx/fontenc.h b/include/wx/fontenc.h index 2848155239..0a649c423b 100644 --- a/include/wx/fontenc.h +++ b/include/wx/fontenc.h @@ -55,7 +55,7 @@ enum wxFontEncoding wxFONTENCODING_CP874, // WinThai wxFONTENCODING_CP932, // Japanese (shift-JIS) wxFONTENCODING_CP936, // Chinese simplified (GB) - wxFONTENCODING_CP949, // Korean (Hangul charset) + wxFONTENCODING_CP949, // Korean (Hangul charset, a.k.a. EUC-KR) wxFONTENCODING_CP950, // Chinese (traditional - Big5) wxFONTENCODING_CP1250, // WinLatin2 wxFONTENCODING_CP1251, // WinCyrillic @@ -148,7 +148,10 @@ enum wxFontEncoding wxFONTENCODING_BIG5 = wxFONTENCODING_CP950, // Traditional Chinese // Japanese (see http://zsigri.tripod.com/fontboard/cjk/jis.html) - wxFONTENCODING_SHIFT_JIS = wxFONTENCODING_CP932 // Shift JIS + wxFONTENCODING_SHIFT_JIS = wxFONTENCODING_CP932, // Shift JIS + + // Korean (CP 949 not actually the same but close enough) + wxFONTENCODING_EUC_KR = wxFONTENCODING_CP949 }; #endif // _WX_FONTENC_H_ diff --git a/interface/wx/font.h b/interface/wx/font.h index 4de0858874..f9e22b306b 100644 --- a/interface/wx/font.h +++ b/interface/wx/font.h @@ -237,13 +237,10 @@ enum wxFontEncoding /// (this is used by wxEncodingConverter and wxUTFFile only for now) wxFONTENCODING_UNICODE, - // alternative names for 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_SHIFT_JIS = wxFONTENCODING_CP932, //!< Shift JIS + wxFONTENCODING_EUC_KR = wxFONTENCODING_CP949 //!< Korean }; -- 2.45.2