X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a243da29c8135be476e47a035a81e695bbb21e26..3603e5658fbd0693f71bbe62ed0239b4f96fd4e0:/src/common/fmapbase.cpp diff --git a/src/common/fmapbase.cpp b/src/common/fmapbase.cpp index 4cc35599fd..8f09c9a04e 100644 --- a/src/common/fmapbase.cpp +++ b/src/common/fmapbase.cpp @@ -6,7 +6,7 @@ // Created: 21.06.2003 (extracted from common/fontmap.cpp) // RCS-ID: $Id$ // Copyright: (c) 1999-2003 Vadim Zeitlin -// License: wxWindows license +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -74,6 +74,7 @@ static const wxFontEncoding gs_encodings[] = wxFONTENCODING_ISO8859_15, wxFONTENCODING_KOI8, wxFONTENCODING_KOI8_U, + wxFONTENCODING_CP866, wxFONTENCODING_CP874, wxFONTENCODING_CP932, wxFONTENCODING_CP936, @@ -163,6 +164,7 @@ static const char* const gs_encodingDescs[] = wxTRANSLATE( "Western European with Euro (ISO-8859-15)" ), wxTRANSLATE( "KOI8-R" ), wxTRANSLATE( "KOI8-U" ), + wxTRANSLATE( "Windows/DOS OEM Cyrillic (CP 866)" ), wxTRANSLATE( "Windows Thai (CP 874)" ), wxTRANSLATE( "Windows Japanese (CP 932)" ), wxTRANSLATE( "Windows Chinese Simplified (CP 936)" ), @@ -266,6 +268,8 @@ static const wxChar* const gs_encodingNames[WXSIZEOF(gs_encodingDescs)][9] = { wxT( "KOI8-R" ), wxT( "KOI8-RU" ), NULL }, { wxT( "KOI8-U" ), NULL }, + { wxT( "WINDOWS-866" ), wxT( "CP866" ), NULL }, + { wxT( "WINDOWS-874" ), wxT( "CP874" ), wxT( "MS874" ), wxT( "IBM-874" ), NULL }, { wxT( "WINDOWS-932" ), wxT( "CP932" ), wxT( "MS932" ), wxT( "IBM-932" ), NULL }, { wxT( "WINDOWS-936" ), wxT( "CP936" ), wxT( "MS936" ), wxT( "IBM-936" ), NULL },