From: Václav Slavík <vslavik@fastmail.fm>
Date: Wed, 19 Jan 2000 00:59:51 +0000 (+0000)
Subject: iso8859-1,15 and cp1252 added to Cyrillic charsets
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/617eb021db47c64790700e4b3a0e02c90761cda8?ds=sidebyside

iso8859-1,15 and cp1252 added to Cyrillic charsets


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

diff --git a/src/common/encconv.cpp b/src/common/encconv.cpp
index 9a1c486728..3a5ce7faba 100644
--- a/src/common/encconv.cpp
+++ b/src/common/encconv.cpp
@@ -287,9 +287,9 @@ wxString wxEncodingConverter::Convert(const wxString& input)
 #define STOP wxFONTENCODING_SYSTEM
 
 #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
-           // Anybody thinks 3 is not enough? ;-)
+           // Anybody thinks 5 is not enough? ;-)
 
 static wxFontEncoding 
     EquivalentEncodings[][NUM_OF_PLATFORMS][ENC_PER_PLATFORM+1] = {
@@ -354,8 +354,9 @@ static wxFontEncoding
 
     // Cyrillic
     {
-        /* unix    */ {wxFONTENCODING_ISO8859_13, wxFONTENCODING_ISO8859_4, STOP},
-        /* windows */ {wxFONTENCODING_CP1257, STOP},
+        /* unix    */ {wxFONTENCODING_ISO8859_13, wxFONTENCODING_ISO8859_4,
+                       wxFONTENCODING_ISO8859_15, wxFONTENCODING_ISO8859_1, STOP},
+        /* windows */ {wxFONTENCODING_CP1257, wxFONTENCODING_CP1252, STOP},
         /* os2     */ {STOP},
         /* mac     */ {STOP}   
     },