From 0980e7b3239f825316dde94c61c01bf210dc135b Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 1 Jun 2012 11:01:37 +0000 Subject: [PATCH] Use "GBK" as alternative name for CP936 encoding. This is the official name of this encoding, so recognize it as synonym. See #14360. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71629 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/fmapbase.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/fmapbase.cpp b/src/common/fmapbase.cpp index 2fe0cccbad..c9a529a63a 100644 --- a/src/common/fmapbase.cpp +++ b/src/common/fmapbase.cpp @@ -266,7 +266,7 @@ static const wxChar* const gs_encodingNames[][9] = { wxT( "WINDOWS-874" ), wxT( "CP874" ), wxT( "MS874" ), wxT( "IBM-874" ), NULL }, { wxT( "WINDOWS-932" ), wxT( "CP932" ), wxT( "MS932" ), wxT( "IBM-932" ), wxT( "SJIS" ), wxT( "SHIFT-JIS" ), wxT( "SHIFT_JIS" ), NULL }, - { wxT( "WINDOWS-936" ), wxT( "CP936" ), wxT( "MS936" ), wxT( "IBM-936" ), wxT( "GB2312" ), NULL }, + { wxT( "WINDOWS-936" ), wxT( "CP936" ), wxT( "MS936" ), wxT( "IBM-936" ), wxT( "GB2312" ), wxT( "gbk" ),wxT( "GBK" ), NULL }, { wxT( "WINDOWS-949" ), wxT( "CP949" ), wxT( "MS949" ), wxT( "IBM-949" ), wxT( "EUC-KR" ), wxT( "eucKR" ), wxT( "euc_kr" ), NULL }, { wxT( "WINDOWS-950" ), wxT( "CP950" ), wxT( "MS950" ), wxT( "IBM-950" ), wxT( "BIG5" ), wxT( "BIG-5" ), wxT( "BIG-FIVE" ), NULL }, { wxT( "WINDOWS-1250" ),wxT( "CP1250" ),wxT( "MS1250" ),wxT( "IBM-1250" ),NULL }, -- 2.50.0