added ISO-2022-JP encoding

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48347 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-08-22 21:46:01 +00:00
parent 7274390ff1
commit a220ccb313
2 changed files with 7 additions and 0 deletions

View File

@@ -116,6 +116,10 @@ enum wxFontEncoding
wxFONTENCODING_MACGAELIC, wxFONTENCODING_MACGAELIC,
wxFONTENCODING_MACKEYBOARD, 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_MAX, // highest enumerated encoding value
wxFONTENCODING_MACMIN = wxFONTENCODING_MACROMAN , wxFONTENCODING_MACMIN = wxFONTENCODING_MACROMAN ,

View File

@@ -99,6 +99,7 @@ static wxFontEncoding gs_encodings[] =
wxFONTENCODING_BIG5, wxFONTENCODING_BIG5,
wxFONTENCODING_SHIFT_JIS, wxFONTENCODING_SHIFT_JIS,
wxFONTENCODING_GB2312, wxFONTENCODING_GB2312,
wxFONTENCODING_ISO2022_JP,
}; };
// the descriptions for them // the descriptions for them
@@ -153,6 +154,7 @@ static const wxChar* gs_encodingDescs[] =
wxTRANSLATE( "BIG5" ), wxTRANSLATE( "BIG5" ),
wxTRANSLATE( "SHIFT-JIS" ), wxTRANSLATE( "SHIFT-JIS" ),
wxTRANSLATE( "GB-2312" ), wxTRANSLATE( "GB-2312" ),
wxTRANSLATE( "ISO-2022-JP" ),
}; };
// and the internal names (these are not translated on purpose!) // 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( "BIG5" ), wxT("big5"), NULL },
{ wxT( "SJIS" ), wxT( "SHIFT-JIS" ), wxT( "SHIFT_JIS" ), NULL }, { wxT( "SJIS" ), wxT( "SHIFT-JIS" ), wxT( "SHIFT_JIS" ), NULL },
{ wxT( "GB2312" ), NULL }, { wxT( "GB2312" ), NULL },
{ wxT( "ISO-2022-JP" ), NULL },
}; };
wxCOMPILE_TIME_ASSERT( WXSIZEOF(gs_encodingDescs) == WXSIZEOF(gs_encodings), EncodingsArraysNotInSync ); wxCOMPILE_TIME_ASSERT( WXSIZEOF(gs_encodingDescs) == WXSIZEOF(gs_encodings), EncodingsArraysNotInSync );