Misc validity fixes to samples/xrc/rc/*.xrc.

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

diff --git a/src/common/encconv.cpp b/src/common/encconv.cpp
index d4f8aebebeb3b3137688cbeebe00094d85de457a..e666b9f245ba2e33bcf05bafa4c229a7581e59a1 100644 (file)
--- a/src/common/encconv.cpp
+++ b/src/common/encconv.cpp
@@ -1,16 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        encconv.cpp
+// Name:        src/common/encconv.cpp

 // Purpose:     wxEncodingConverter class for converting between different
 //              font encodings
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
 // Purpose:     wxEncodingConverter class for converting between different
 //              font encodings
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik

-// Licence:     wxWindows Licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "encconv.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -23,20 +19,52 @@
 #include <stdlib.h>
 
 // conversion tables, generated by scripts in $(WXWIN)/misc/unictabl:
 #include <stdlib.h>
 
 // conversion tables, generated by scripts in $(WXWIN)/misc/unictabl:

-#ifdef __BORLANDC__
-#include "../common/unictabl.inc"
+#if defined( __BORLANDC__ ) || defined(__DARWIN__)
+    #include "../common/unictabl.inc"

 #else
 #else

-#include "unictabl.inc"
+    #include "unictabl.inc"

 #endif
 
 #endif
 

-#if wxUSE_WCHAR_T
-typedef wchar_t tchar;
-#else
-typedef char tchar;
+#ifdef __WXMAC__
+    #include "wx/osx/core/cfstring.h"
+    #include <CoreFoundation/CFStringEncodingExt.h>
+
+    wxUint16 gMacEncodings[wxFONTENCODING_MACMAX-wxFONTENCODING_MACMIN+1][128] ;
+    bool gMacEncodingsInited[wxFONTENCODING_MACMAX-wxFONTENCODING_MACMIN+1] ;
+#endif
+
+#ifdef __WXWINCE__
+    #include "wx/msw/wince/missing.h"       // for bsearch()

 #endif
 
 #endif
 

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

 {
 {

+#ifdef __WXMAC__
+    if( enc >= wxFONTENCODING_MACMIN && enc <= wxFONTENCODING_MACMAX )
+    {
+        int i = enc-wxFONTENCODING_MACMIN ;
+        if ( gMacEncodingsInited[i] == false )
+        {
+            // create
+            CFStringEncoding cfencoding = wxMacGetSystemEncFromFontEnc( enc ) ;
+            if( !CFStringIsEncodingAvailable( cfencoding ) )
+                return NULL;
+
+            memset( gMacEncodings[i] , 0 , 128 * 2 );
+            char s[2] = { 0 , 0 };
+            CFRange firstchar = CFRangeMake( 0, 1 );
+            for( unsigned char c = 255 ; c >= 128 ; --c )
+            {
+                s[0] = c ;
+                wxCFStringRef cfref( CFStringCreateWithCStringNoCopy( NULL, s, cfencoding , kCFAllocatorNull ) );
+                CFStringGetCharacters( cfref, firstchar, (UniChar*)  &gMacEncodings[i][c-128] );
+            }
+            gMacEncodingsInited[i]=true;
+        }
+        return gMacEncodings[i] ;
+    }
+#endif
+

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


@@ -50,20 +78,21 @@ typedef struct {
     wxUint8  c;
 } CharsetItem;
 
     wxUint8  c;
 } CharsetItem;
 

-
-
-static int LINKAGEMODE CompareCharsetItems(const void *i1, const void *i2)
+extern "C"
+{
+static int wxCMPFUNC_CONV
+CompareCharsetItems(const void *i1, const void *i2)

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

+}

 
 

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

 {
     CharsetItem *rev = new CharsetItem[128];
 
     for (int i = 0; i < 128; i++)
 {
     CharsetItem *rev = new CharsetItem[128];
 
     for (int i = 0; i < 128; i++)

-        rev[i].c = 128 + i, rev[i].u = tbl[i];
+        rev[i].c = wxUint8(128 + i), rev[i].u = tbl[i];

 
     qsort(rev, 128, sizeof(CharsetItem), CompareCharsetItems);
 
 
     qsort(rev, 128, sizeof(CharsetItem), CompareCharsetItems);
 


@@ -75,8 +104,8 @@ static CharsetItem* LINKAGEMODE BuildReverseTable(wxUint16 *tbl)
 wxEncodingConverter::wxEncodingConverter()
 {
     m_Table = NULL;
 wxEncodingConverter::wxEncodingConverter()
 {
     m_Table = NULL;

-    m_UnicodeInput = m_UnicodeOutput = FALSE;
-    m_JustCopy = FALSE;
+    m_UnicodeInput = m_UnicodeOutput = false;
+    m_JustCopy = false;

 }
 
 
 }
 
 


@@ -84,61 +113,56 @@ wxEncodingConverter::wxEncodingConverter()
 bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_enc, int method)
 {
     unsigned i;
 bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_enc, int method)
 {
     unsigned i;

-    wxUint16 *in_tbl = NULL, *out_tbl = NULL;
-
-    if (m_Table) {delete[] m_Table; m_Table = NULL;}
+    const wxUint16 *in_tbl;
+    const wxUint16 *out_tbl = NULL;

 
 

-#if !wxUSE_WCHAR_T
-    if (input_enc == wxFONTENCODING_UNICODE || output_enc == wxFONTENCODING_UNICODE) return FALSE;
-#endif
+    wxDELETEA(m_Table);

 
 

-    if (input_enc == output_enc) {m_JustCopy = TRUE; return TRUE;}
+    if (input_enc == output_enc) {m_JustCopy = true; return true;}

 
     m_UnicodeOutput = (output_enc == wxFONTENCODING_UNICODE);
 
     m_UnicodeOutput = (output_enc == wxFONTENCODING_UNICODE);

-    m_JustCopy = FALSE;
+    m_JustCopy = false;

 
     if (input_enc == wxFONTENCODING_UNICODE)
     {
 
     if (input_enc == wxFONTENCODING_UNICODE)
     {

-        if ((out_tbl = GetEncTable(output_enc)) == NULL) return FALSE;
+        if ((out_tbl = GetEncTable(output_enc)) == NULL) return false;

 
 

-        m_Table = new tchar[65536];
-        for (i = 0; i < 128; i++)  m_Table[i] = (tchar)i; // 7bit ASCII
-        for (i = 128; i < 65536; i++)  m_Table[i] = (tchar)'?';
-                // FIXME - this should be character that means `unicode to charset' impossible, not '?'
+        m_Table = new wchar_t[65536];
+        for (i = 0; i < 128; i++)  m_Table[i] = (wchar_t)i; // 7bit ASCII
+        for (i = 128; i < 65536; i++)  m_Table[i] = (wchar_t)0;

 
         if (method == wxCONVERT_SUBSTITUTE)
         {
             for (i = 0; i < encoding_unicode_fallback_count; i++)
 
         if (method == wxCONVERT_SUBSTITUTE)
         {
             for (i = 0; i < encoding_unicode_fallback_count; i++)

-                m_Table[encoding_unicode_fallback[i].c] = (tchar) encoding_unicode_fallback[i].s;
+                m_Table[encoding_unicode_fallback[i].c] = (wchar_t) encoding_unicode_fallback[i].s;

         }
 
         for (i = 0; i < 128; i++)
         }
 
         for (i = 0; i < 128; i++)

-            m_Table[out_tbl[i]] = (tchar)(128 + i);
+            m_Table[out_tbl[i]] = (wchar_t)(128 + i);

 
 

-        m_UnicodeInput = TRUE;
-        return TRUE;
+        m_UnicodeInput = true;

     }
     }

-
-    else
+    else // input !Unicode

     {
     {

-        if ((in_tbl = GetEncTable(input_enc)) == NULL) return FALSE;
+        if ((in_tbl = GetEncTable(input_enc)) == NULL) return false;

         if (output_enc != wxFONTENCODING_UNICODE)
         if (output_enc != wxFONTENCODING_UNICODE)

-            if ((out_tbl = GetEncTable(output_enc)) == NULL) return FALSE;
+            if ((out_tbl = GetEncTable(output_enc)) == NULL) return false;

 
 

-        m_UnicodeInput = FALSE;
+        m_UnicodeInput = false;

 
 

-        m_Table = new tchar[256];
-        for (i = 0; i < 128; i++)  m_Table[i] = (tchar)i; // 7bit ASCII
+        m_Table = new wchar_t[256];
+        for (i = 0; i < 128; i++)  m_Table[i] = (wchar_t)i; // 7bit ASCII

 
         if (output_enc == wxFONTENCODING_UNICODE)
         {
 
         if (output_enc == wxFONTENCODING_UNICODE)
         {

-            for (i = 0; i < 128; i++)  m_Table[128 + i] = (tchar)in_tbl[i];
-            return TRUE;
+            for (i = 0; i < 128; i++)  m_Table[128 + i] = (wchar_t)in_tbl[i];
+            return true;

         }
         }

-        else
+        else // output !Unicode

         {
             CharsetItem *rev = BuildReverseTable(out_tbl);
         {
             CharsetItem *rev = BuildReverseTable(out_tbl);

-            CharsetItem *item, key;
+            CharsetItem *item;
+            CharsetItem key;

 
             for (i = 0; i < 128; i++)
             {
 
             for (i = 0; i < 128; i++)
             {


@@ -148,20 +172,34 @@ bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_e
                     item = (CharsetItem*) bsearch(&key, encoding_unicode_fallback,
                                 encoding_unicode_fallback_count, sizeof(CharsetItem), CompareCharsetItems);
                 if (item)
                     item = (CharsetItem*) bsearch(&key, encoding_unicode_fallback,
                                 encoding_unicode_fallback_count, sizeof(CharsetItem), CompareCharsetItems);
                 if (item)

-                    m_Table[128 + i] = (tchar)item -> c;
+                    m_Table[128 + i] = (wchar_t)item -> c;

                 else
                 else

-                    m_Table[128 + i] = 128 + i; // don't know => don't touch
+                    m_Table[128 + i] = (wchar_t)(128 + i);

             }
 
             delete[] rev;
             }
 
             delete[] rev;

-            return TRUE;

         }
     }
         }
     }

+
+    return true;

 }
 
 
 }
 
 

+#define REPLACEMENT_CHAR  (L'?')

 
 

-void wxEncodingConverter::Convert(const char* input, char* output)
+inline wchar_t GetTableValue(const wchar_t *table, wchar_t value, bool& repl)
+{
+    wchar_t r = table[value];
+    if (r == 0 && value != 0)
+    {
+        r = REPLACEMENT_CHAR;
+        repl = true;
+    }
+    return r;
+}
+
+
+bool wxEncodingConverter::Convert(const char* input, char* output) const

 {
     wxASSERT_MSG(!m_UnicodeOutput, wxT("You cannot convert to unicode if output is const char*!"));
     wxASSERT_MSG(!m_UnicodeInput, wxT("You cannot convert from unicode if input is const char*!"));
 {
     wxASSERT_MSG(!m_UnicodeOutput, wxT("You cannot convert to unicode if output is const char*!"));
     wxASSERT_MSG(!m_UnicodeInput, wxT("You cannot convert from unicode if input is const char*!"));


@@ -172,20 +210,23 @@ void wxEncodingConverter::Convert(const char* input, char* output)
     if (m_JustCopy)
     {
         strcpy(output, input);
     if (m_JustCopy)
     {
         strcpy(output, input);

-        return;
+        return true;

     }
 
     }
 

-    wxASSERT_MSG(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!"));
+    wxCHECK_MSG(m_Table != NULL, false,
+                wxT("You must call wxEncodingConverter::Init() before actually converting!"));
+
+    bool replaced = false;

 
     for (i = input, o = output; *i != 0;)
 
     for (i = input, o = output; *i != 0;)

-        *(o++) = (char)(m_Table[(wxUint8)*(i++)]);
+        *(o++) = (char)(GetTableValue(m_Table, (wxUint8)*(i++), replaced));

     *o = 0;
     *o = 0;

-}

 
 

+    return !replaced;
+}

 
 

-#if wxUSE_WCHAR_T

 
 

-void wxEncodingConverter::Convert(const char* input, wchar_t* output)
+bool wxEncodingConverter::Convert(const char* input, wchar_t* output) const

 {
     wxASSERT_MSG(m_UnicodeOutput, wxT("You cannot convert to 8-bit if output is const wchar_t*!"));
     wxASSERT_MSG(!m_UnicodeInput, wxT("You cannot convert from unicode if input is const char*!"));
 {
     wxASSERT_MSG(m_UnicodeOutput, wxT("You cannot convert to 8-bit if output is const wchar_t*!"));
     wxASSERT_MSG(!m_UnicodeInput, wxT("You cannot convert from unicode if input is const char*!"));


@@ -198,19 +239,24 @@ void wxEncodingConverter::Convert(const char* input, wchar_t* output)
         for (i = input, o = output; *i != 0;)
             *(o++) = (wchar_t)(*(i++));
         *o = 0;
         for (i = input, o = output; *i != 0;)
             *(o++) = (wchar_t)(*(i++));
         *o = 0;

-        return;
+        return true;

     }
 
     }
 

-    wxASSERT_MSG(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!"));
+    wxCHECK_MSG(m_Table != NULL, false,
+                wxT("You must call wxEncodingConverter::Init() before actually converting!"));
+
+    bool replaced = false;

 
     for (i = input, o = output; *i != 0;)
 
     for (i = input, o = output; *i != 0;)

-        *(o++) = (wchar_t)(m_Table[(wxUint8)*(i++)]);
+        *(o++) = (wchar_t)(GetTableValue(m_Table, (wxUint8)*(i++), replaced));

     *o = 0;
     *o = 0;

+
+    return !replaced;

 }
 
 
 
 }
 
 
 

-void wxEncodingConverter::Convert(const wchar_t* input, char* output)
+bool wxEncodingConverter::Convert(const wchar_t* input, char* output) const

 {
     wxASSERT_MSG(!m_UnicodeOutput, wxT("You cannot convert to unicode if output is const char*!"));
     wxASSERT_MSG(m_UnicodeInput, wxT("You cannot convert from 8-bit if input is const wchar_t*!"));
 {
     wxASSERT_MSG(!m_UnicodeOutput, wxT("You cannot convert to unicode if output is const char*!"));
     wxASSERT_MSG(m_UnicodeInput, wxT("You cannot convert from 8-bit if input is const wchar_t*!"));


@@ -223,19 +269,24 @@ void wxEncodingConverter::Convert(const wchar_t* input, char* output)
         for (i = input, o = output; *i != 0;)
             *(o++) = (char)(*(i++));
         *o = 0;
         for (i = input, o = output; *i != 0;)
             *(o++) = (char)(*(i++));
         *o = 0;

-        return;
+        return true;

     }
 
     }
 

-    wxASSERT_MSG(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!"));
+    wxCHECK_MSG(m_Table != NULL, false,
+                wxT("You must call wxEncodingConverter::Init() before actually converting!"));
+
+    bool replaced = false;

 
     for (i = input, o = output; *i != 0;)
 
     for (i = input, o = output; *i != 0;)

-        *(o++) = (char)(m_Table[(wxUint16)*(i++)]);
+        *(o++) = (char)(GetTableValue(m_Table, (wxUint16)*(i++), replaced));

     *o = 0;
     *o = 0;

+
+    return !replaced;

 }
 
 
 
 }
 
 
 

-void wxEncodingConverter::Convert(const wchar_t* input, wchar_t* output)
+bool wxEncodingConverter::Convert(const wchar_t* input, wchar_t* output) const

 {
     wxASSERT_MSG(m_UnicodeOutput, wxT("You cannot convert to 8-bit if output is const wchar_t*!"));
     wxASSERT_MSG(m_UnicodeInput, wxT("You cannot convert from 8-bit if input is const wchar_t*!"));
 {
     wxASSERT_MSG(m_UnicodeOutput, wxT("You cannot convert to 8-bit if output is const wchar_t*!"));
     wxASSERT_MSG(m_UnicodeInput, wxT("You cannot convert from 8-bit if input is const wchar_t*!"));


@@ -249,34 +300,43 @@ void wxEncodingConverter::Convert(const wchar_t* input, wchar_t* output)
         for (i = input, o = output; *i != 0;)
             *(o++) = (*(i++));
         *o = 0;
         for (i = input, o = output; *i != 0;)
             *(o++) = (*(i++));
         *o = 0;

-        return;
+        return true;

     }
 
     }
 

-    wxASSERT_MSG(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!"));
+    wxCHECK_MSG(m_Table != NULL, false,
+                wxT("You must call wxEncodingConverter::Init() before actually converting!"));
+
+    bool replaced = false;

 
     for (i = input, o = output; *i != 0;)
 
     for (i = input, o = output; *i != 0;)

-        *(o++) = (wchar_t)(m_Table[(wxUint8)*(i++)]);
+        *(o++) = (wchar_t)(GetTableValue(m_Table, (wxUint8)*(i++), replaced));

     *o = 0;
     *o = 0;

-}

 
 

-#endif // wxUSE_WCHAR_T
+    return !replaced;
+}

 
 
 
 

-wxString wxEncodingConverter::Convert(const wxString& input)
+wxString wxEncodingConverter::Convert(const wxString& input) const

 {
     if (m_JustCopy) return input;
 
     wxString s;
     const wxChar *i;
 
 {
     if (m_JustCopy) return input;
 
     wxString s;
     const wxChar *i;
 

-    wxASSERT_MSG(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!"));
+    wxCHECK_MSG(m_Table != NULL, s,
+                wxT("You must call wxEncodingConverter::Init() before actually converting!"));

 
     if (m_UnicodeInput)
 
     if (m_UnicodeInput)

+    {

         for (i = input.c_str(); *i != 0; i++)
             s << (wxChar)(m_Table[(wxUint16)*i]);
         for (i = input.c_str(); *i != 0; i++)
             s << (wxChar)(m_Table[(wxUint16)*i]);

+    }

     else
     else

+    {

         for (i = input.c_str(); *i != 0; i++)
             s << (wxChar)(m_Table[(wxUint8)*i]);
         for (i = input.c_str(); *i != 0; i++)
             s << (wxChar)(m_Table[(wxUint8)*i]);

+    }
+

     return s;
 }
 
     return s;
 }
 


@@ -292,11 +352,12 @@ wxString wxEncodingConverter::Convert(const wxString& input)
 #define STOP wxFONTENCODING_SYSTEM
 
 #define NUM_OF_PLATFORMS  4 /*must conform to enum wxPLATFORM_XXXX !!!*/
 #define STOP wxFONTENCODING_SYSTEM
 
 #define NUM_OF_PLATFORMS  4 /*must conform to enum wxPLATFORM_XXXX !!!*/

-#define ENC_PER_PLATFORM  5
-           // max no. of encodings for one language used on one platform
-           // Anybody thinks 5 is not enough? ;-)
+#define ENC_PER_PLATFORM  3
+           // max no. of encodings for one language used on one platform.
+           // Using maximum of everything at the current moment to not make the
+           // library larger than necessary. Make larger only if necessary - MR

 
 

-static wxFontEncoding
+static const wxFontEncoding

     EquivalentEncodings[][NUM_OF_PLATFORMS][ENC_PER_PLATFORM+1] = {
 
     // *** Please put more common encodings as first! ***
     EquivalentEncodings[][NUM_OF_PLATFORMS][ENC_PER_PLATFORM+1] = {
 
     // *** Please put more common encodings as first! ***


@@ -306,7 +367,7 @@ static wxFontEncoding
         /* unix    */ {wxFONTENCODING_ISO8859_1, wxFONTENCODING_ISO8859_15, STOP},
         /* windows */ {wxFONTENCODING_CP1252, STOP},
         /* os2     */ {STOP},
         /* unix    */ {wxFONTENCODING_ISO8859_1, wxFONTENCODING_ISO8859_15, STOP},
         /* windows */ {wxFONTENCODING_CP1252, STOP},
         /* os2     */ {STOP},

-        /* mac     */ {STOP}
+        /* mac     */ {wxFONTENCODING_MACROMAN, STOP}

     },
 
     // Central European
     },
 
     // Central European


@@ -314,7 +375,7 @@ static wxFontEncoding
         /* unix    */ {wxFONTENCODING_ISO8859_2, STOP},
         /* windows */ {wxFONTENCODING_CP1250, STOP},
         /* os2     */ {STOP},
         /* unix    */ {wxFONTENCODING_ISO8859_2, STOP},
         /* windows */ {wxFONTENCODING_CP1250, STOP},
         /* os2     */ {STOP},

-        /* mac     */ {STOP}
+        /* mac     */ {wxFONTENCODING_MACCENTRALEUR, STOP}

     },
 
     // Baltic
     },
 
     // Baltic


@@ -330,7 +391,7 @@ static wxFontEncoding
         /* unix    */ {wxFONTENCODING_ISO8859_8, STOP},
         /* windows */ {wxFONTENCODING_CP1255, STOP},
         /* os2     */ {STOP},
         /* unix    */ {wxFONTENCODING_ISO8859_8, STOP},
         /* windows */ {wxFONTENCODING_CP1255, STOP},
         /* os2     */ {STOP},

-        /* mac     */ {STOP}
+        /* mac     */ {wxFONTENCODING_MACHEBREW, STOP}

     },
 
     // Greek
     },
 
     // Greek


@@ -338,7 +399,7 @@ static wxFontEncoding
         /* unix    */ {wxFONTENCODING_ISO8859_7, STOP},
         /* windows */ {wxFONTENCODING_CP1253, STOP},
         /* os2     */ {STOP},
         /* unix    */ {wxFONTENCODING_ISO8859_7, STOP},
         /* windows */ {wxFONTENCODING_CP1253, STOP},
         /* os2     */ {STOP},

-        /* mac     */ {STOP}
+        /* mac     */ {wxFONTENCODING_MACGREEK, STOP}

     },
 
     // Arabic
     },
 
     // Arabic


@@ -346,7 +407,7 @@ static wxFontEncoding
         /* unix    */ {wxFONTENCODING_ISO8859_6, STOP},
         /* windows */ {wxFONTENCODING_CP1256, STOP},
         /* os2     */ {STOP},
         /* unix    */ {wxFONTENCODING_ISO8859_6, STOP},
         /* windows */ {wxFONTENCODING_CP1256, STOP},
         /* os2     */ {STOP},

-        /* mac     */ {STOP}
+        /* mac     */ {wxFONTENCODING_MACARABIC, STOP}

     },
 
     // Turkish
     },
 
     // Turkish


@@ -354,15 +415,15 @@ static wxFontEncoding
         /* unix    */ {wxFONTENCODING_ISO8859_9, STOP},
         /* windows */ {wxFONTENCODING_CP1254, STOP},
         /* os2     */ {STOP},
         /* unix    */ {wxFONTENCODING_ISO8859_9, STOP},
         /* windows */ {wxFONTENCODING_CP1254, STOP},
         /* os2     */ {STOP},

-        /* mac     */ {STOP}
+        /* mac     */ {wxFONTENCODING_MACTURKISH, STOP}

     },
 
     // Cyrillic
     {
     },
 
     // Cyrillic
     {

-        /* unix    */ {wxFONTENCODING_KOI8, wxFONTENCODING_ISO8859_5, STOP},
+        /* unix    */ {wxFONTENCODING_KOI8, wxFONTENCODING_KOI8_U, wxFONTENCODING_ISO8859_5, STOP},

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

-        /* mac     */ {STOP}
+        /* mac     */ {wxFONTENCODING_MACCYRILLIC, STOP}

     },
 
     {{STOP},{STOP},{STOP},{STOP}} /* Terminator */
     },
 
     {{STOP},{STOP},{STOP},{STOP}} /* Terminator */


@@ -370,17 +431,24 @@ static wxFontEncoding
 };
 
 
 };
 
 

-
+static bool FindEncoding(const wxFontEncodingArray& arr, wxFontEncoding f)
+{
+    for (wxFontEncodingArray::const_iterator it = arr.begin(), en = arr.end();
+         it != en; ++it)
+        if (*it == f)
+            return true;
+    return false;
+}

 
 wxFontEncodingArray wxEncodingConverter::GetPlatformEquivalents(wxFontEncoding enc, int platform)
 {
     if (platform == wxPLATFORM_CURRENT)
     {
 
 wxFontEncodingArray wxEncodingConverter::GetPlatformEquivalents(wxFontEncoding enc, int platform)
 {
     if (platform == wxPLATFORM_CURRENT)
     {

-#if defined(__WXMSW__)
+#if defined(__WINDOWS__)

         platform = wxPLATFORM_WINDOWS;
 #elif defined(__WXGTK__) || defined(__WXMOTIF__)
         platform = wxPLATFORM_UNIX;
         platform = wxPLATFORM_WINDOWS;
 #elif defined(__WXGTK__) || defined(__WXMOTIF__)
         platform = wxPLATFORM_UNIX;

-#elif defined(__WXOS2__)
+#elif defined(__WXPM__)

         platform = wxPLATFORM_OS2;
 #elif defined(__WXMAC__)
         platform = wxPLATFORM_MAC;
         platform = wxPLATFORM_OS2;
 #elif defined(__WXMAC__)
         platform = wxPLATFORM_MAC;


@@ -388,7 +456,7 @@ wxFontEncodingArray wxEncodingConverter::GetPlatformEquivalents(wxFontEncoding e
     }
 
     int i, clas, e ;
     }
 
     int i, clas, e ;

-    wxFontEncoding *f;
+    const wxFontEncoding *f;

     wxFontEncodingArray arr;
 
     clas = 0;
     wxFontEncodingArray arr;
 
     clas = 0;


@@ -399,9 +467,9 @@ wxFontEncodingArray wxEncodingConverter::GetPlatformEquivalents(wxFontEncoding e
                 if (EquivalentEncodings[clas][i][e] == enc)
                 {
                     for (f = EquivalentEncodings[clas][platform]; *f != STOP; f++)
                 if (EquivalentEncodings[clas][i][e] == enc)
                 {
                     for (f = EquivalentEncodings[clas][platform]; *f != STOP; f++)

-                        if (*f == enc) arr.Add(enc);
+                        if (*f == enc) arr.push_back(enc);

                     for (f = EquivalentEncodings[clas][platform]; *f != STOP; f++)
                     for (f = EquivalentEncodings[clas][platform]; *f != STOP; f++)

-                        if (arr.Index(*f) == wxNOT_FOUND) arr.Add(*f);
+                        if (!FindEncoding(arr, *f)) arr.push_back(*f);

                     i = NUM_OF_PLATFORMS/*hack*/; break;
                 }
         clas++;
                     i = NUM_OF_PLATFORMS/*hack*/; break;
                 }
         clas++;


@@ -415,7 +483,7 @@ wxFontEncodingArray wxEncodingConverter::GetPlatformEquivalents(wxFontEncoding e
 wxFontEncodingArray wxEncodingConverter::GetAllEquivalents(wxFontEncoding enc)
 {
     int i, clas, e, j ;
 wxFontEncodingArray wxEncodingConverter::GetAllEquivalents(wxFontEncoding enc)
 {
     int i, clas, e, j ;

-    wxFontEncoding *f;
+    const wxFontEncoding *f;

     wxFontEncodingArray arr;
 
     arr = GetPlatformEquivalents(enc); // we want them to be first items in array
     wxFontEncodingArray arr;
 
     arr = GetPlatformEquivalents(enc); // we want them to be first items in array


@@ -429,7 +497,7 @@ wxFontEncodingArray wxEncodingConverter::GetAllEquivalents(wxFontEncoding enc)
                 {
                     for (j = 0; j < NUM_OF_PLATFORMS; j++)
                         for (f = EquivalentEncodings[clas][j]; *f != STOP; f++)
                 {
                     for (j = 0; j < NUM_OF_PLATFORMS; j++)
                         for (f = EquivalentEncodings[clas][j]; *f != STOP; f++)

-                            if (arr.Index(*f) == wxNOT_FOUND) arr.Add(*f);
+                            if (!FindEncoding(arr, *f)) arr.push_back(*f);

                     i = NUM_OF_PLATFORMS/*hack*/; break;
                 }
         clas++;
                     i = NUM_OF_PLATFORMS/*hack*/; break;
                 }
         clas++;


@@ -437,3 +505,4 @@ wxFontEncodingArray wxEncodingConverter::GetAllEquivalents(wxFontEncoding enc)
 
     return arr;
 }
 
     return arr;
 }

+