Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iso8859-1,15 and cp1252 added to Cyrillic charsets

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5515 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2000-01-19 00:59:51 +00:00
parent 2bdebb91be
commit 617eb021db
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/common/encconv.cpp
View File

@@ -287,9 +287,9 @@ wxString wxEncodingConverter::Convert(const wxString& input)
#define STOP wxFONTENCODING_SYSTEM #define STOP wxFONTENCODING_SYSTEM
#define NUM_OF_PLATFORMS 4 /*must conform to enum wxPLATFORM_XXXX !!!*/ #define NUM_OF_PLATFORMS 4 /*must conform to enum wxPLATFORM_XXXX !!!*/
#define ENC_PER_PLATFORM 3 #define ENC_PER_PLATFORM 5
// max no. of encodings for one language used on one platform // max no. of encodings for one language used on one platform
// Anybody thinks 3 is not enough? ;-) // Anybody thinks 5 is not enough? ;-)
static wxFontEncoding static wxFontEncoding
EquivalentEncodings[][NUM_OF_PLATFORMS][ENC_PER_PLATFORM+1] = { EquivalentEncodings[][NUM_OF_PLATFORMS][ENC_PER_PLATFORM+1] = {
@@ -354,8 +354,9 @@ static wxFontEncoding
// Cyrillic // Cyrillic
{ {
/* unix */ {wxFONTENCODING_ISO8859_13, wxFONTENCODING_ISO8859_4, STOP}, /* unix */ {wxFONTENCODING_ISO8859_13, wxFONTENCODING_ISO8859_4,
/* windows */ {wxFONTENCODING_CP1257, STOP}, wxFONTENCODING_ISO8859_15, wxFONTENCODING_ISO8859_1, STOP},
/* windows */ {wxFONTENCODING_CP1257, wxFONTENCODING_CP1252, STOP},
/* os2 */ {STOP}, /* os2 */ {STOP},
/* mac */ {STOP} /* mac */ {STOP}
}, },