From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 22 Aug 2007 21:46:01 +0000 (+0000)
Subject: added ISO-2022-JP encoding
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/a220ccb313cde370ad6bec9b2285966525cb8f92

added ISO-2022-JP encoding

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48347 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/fontenc.h b/include/wx/fontenc.h
index 69a7857179..2848155239 100644
--- a/include/wx/fontenc.h
+++ b/include/wx/fontenc.h
@@ -116,6 +116,10 @@ enum wxFontEncoding
     wxFONTENCODING_MACGAELIC,
     wxFONTENCODING_MACKEYBOARD,
 
+    // more CJK encodings (for historical reasons some are already declared
+    // above)
+    wxFONTENCODING_ISO2022_JP,      // ISO-2022-JP JIS encoding
+
     wxFONTENCODING_MAX,             // highest enumerated encoding value
 
     wxFONTENCODING_MACMIN = wxFONTENCODING_MACROMAN ,
diff --git a/src/common/fmapbase.cpp b/src/common/fmapbase.cpp
index 15b742ba22..20e1f3c3be 100644
--- a/src/common/fmapbase.cpp
+++ b/src/common/fmapbase.cpp
@@ -99,6 +99,7 @@ static wxFontEncoding gs_encodings[] =
     wxFONTENCODING_BIG5,
     wxFONTENCODING_SHIFT_JIS,
     wxFONTENCODING_GB2312,
+    wxFONTENCODING_ISO2022_JP,
 };
 
 // the descriptions for them
@@ -153,6 +154,7 @@ static const wxChar* gs_encodingDescs[] =
     wxTRANSLATE( "BIG5" ),
     wxTRANSLATE( "SHIFT-JIS" ),
     wxTRANSLATE( "GB-2312" ),
+    wxTRANSLATE( "ISO-2022-JP" ),
 };
 
 // and the internal names (these are not translated on purpose!)
@@ -220,6 +222,7 @@ static const wxChar* gs_encodingNames[WXSIZEOF(gs_encodingDescs)][9] =
     { wxT( "BIG5" ), wxT("big5"), NULL },
     { wxT( "SJIS" ), wxT( "SHIFT-JIS" ), wxT( "SHIFT_JIS" ), NULL },
     { wxT( "GB2312" ), NULL },
+    { wxT( "ISO-2022-JP" ), NULL },
 };
 
 wxCOMPILE_TIME_ASSERT( WXSIZEOF(gs_encodingDescs) == WXSIZEOF(gs_encodings), EncodingsArraysNotInSync );