moved wxDash typedef to gdicmn.h

[wxWidgets.git] / src / common / encconv.cpp

diff --git a/src/common/encconv.cpp b/src/common/encconv.cpp
index 9a1c4867285668feaa74590d18a490bfc0c55d2d..3a5ce7faba7cdc1f298f47ef5ce91cf875af8fc4 100644 (file)
--- 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}   
     },