added IsEncodingAvailable and GetAltForEncoding extended by facename argument and...

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

diff --git a/src/common/encconv.cpp b/src/common/encconv.cpp
index 0e64e9c67d2b79590969b5f9e5e489bddd75c066..9a1c4867285668feaa74590d18a490bfc0c55d2d 100644 (file)
--- a/src/common/encconv.cpp
+++ b/src/common/encconv.cpp
@@ -30,7 +30,7 @@
 #endif
 
 
 #endif
 
 

-static wxUint16 *GetEncTable(wxFontEncoding enc)
+static wxUint16* LINKAGEMODE GetEncTable(wxFontEncoding enc)

 {
     for (int i = 0; encodings_list[i].table != NULL; i++)
     {
 {
     for (int i = 0; encodings_list[i].table != NULL; i++)
     {


@@ -47,13 +47,13 @@ typedef struct {
 
 
 
 
 
 

-static int CompareCharsetItems(const void *i1, const void *i2)
+static int LINKAGEMODE CompareCharsetItems(const void *i1, const void *i2)

 {
     return ( ((CharsetItem*)i1) -> u - ((CharsetItem*)i2) -> u );
 }
 
 
 {
     return ( ((CharsetItem*)i1) -> u - ((CharsetItem*)i2) -> u );
 }
 
 

-static CharsetItem* BuildReverseTable(wxUint16 *tbl)
+static CharsetItem* LINKAGEMODE BuildReverseTable(wxUint16 *tbl)

 {
     CharsetItem *rev = new CharsetItem[128];
     
 {
     CharsetItem *rev = new CharsetItem[128];
     


@@ -354,7 +354,15 @@ static wxFontEncoding
 
     // Cyrillic
     {
 
     // Cyrillic
     {

-        /* unix    */ {wxFONTENCODING_ISO8859_5, STOP},
+        /* unix    */ {wxFONTENCODING_ISO8859_13, wxFONTENCODING_ISO8859_4, STOP},
+        /* windows */ {wxFONTENCODING_CP1257, STOP},
+        /* os2     */ {STOP},
+        /* mac     */ {STOP}   
+    },
+
+    // Russia and other KOI-8 users:
+    {
+        /* unix    */ {wxFONTENCODING_KOI8, wxFONTENCODING_ISO8859_5, STOP},

         /* windows */ {wxFONTENCODING_CP1251, STOP},
         /* os2     */ {STOP},
         /* mac     */ {STOP}   
         /* windows */ {wxFONTENCODING_CP1251, STOP},
         /* os2     */ {STOP},
         /* mac     */ {STOP}