change to /usr/share/wx/version

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

diff --git a/src/common/encconv.cpp b/src/common/encconv.cpp
index 6404d6ef85bad7fbc260f51599a36e0c750741f2..a266d02c918e6a670dba6ab5efa357b0227d5b57 100644 (file)
--- a/src/common/encconv.cpp
+++ b/src/common/encconv.cpp
@@ -18,6 +18,8 @@
   #pragma hdrstop
 #endif
 
+#if wxUSE_FONTMAP
+
 #include "wx/encconv.h"
 
 #include <stdlib.h>
@@ -26,7 +28,7 @@
 #ifdef __BORLANDC__
 #include "../common/unictabl.inc"
 #else
-#include "unictabl.inc" 
+#include "unictabl.inc"
 #endif
 
 #if wxUSE_WCHAR_T
@@ -39,7 +41,7 @@ static wxUint16* LINKAGEMODE GetEncTable(wxFontEncoding enc)
 {
     for (int i = 0; encodings_list[i].table != NULL; i++)
     {
-        if (encodings_list[i].encoding == enc) 
+        if (encodings_list[i].encoding == enc)
             return encodings_list[i].table;
     }
     return NULL;
@@ -61,12 +63,12 @@ static int LINKAGEMODE CompareCharsetItems(const void *i1, const void *i2)
 static CharsetItem* LINKAGEMODE BuildReverseTable(wxUint16 *tbl)
 {
     CharsetItem *rev = new CharsetItem[128];
-    
+
     for (int i = 0; i < 128; i++)
         rev[i].c = 128 + i, rev[i].u = tbl[i];
 
     qsort(rev, 128, sizeof(CharsetItem), CompareCharsetItems);
-    
+
     return rev;
 }
 
@@ -93,17 +95,17 @@ bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_e
 #endif
 
     if (input_enc == output_enc) {m_JustCopy = TRUE; return TRUE;}
-    
+
     m_UnicodeOutput = (output_enc == wxFONTENCODING_UNICODE);
     m_JustCopy = FALSE;
-    
+
     if (input_enc == wxFONTENCODING_UNICODE)
     {
         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)'?'; 
+        for (i = 128; i < 65536; i++)  m_Table[i] = (tchar)'?';
                 // FIXME - this should be character that means `unicode to charset' impossible, not '?'
 
         if (method == wxCONVERT_SUBSTITUTE)
@@ -118,7 +120,7 @@ bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_e
         m_UnicodeInput = TRUE;
         return TRUE;
     }
-    
+
     else
     {
         if ((in_tbl = GetEncTable(input_enc)) == NULL) return FALSE;
@@ -126,33 +128,38 @@ bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_e
             if ((out_tbl = GetEncTable(output_enc)) == NULL) return FALSE;
 
         m_UnicodeInput = FALSE;
-        
+
         m_Table = new tchar[256];
         for (i = 0; i < 128; i++)  m_Table[i] = (tchar)i; // 7bit ASCII
-        
+
         if (output_enc == wxFONTENCODING_UNICODE)
         {
             for (i = 0; i < 128; i++)  m_Table[128 + i] = (tchar)in_tbl[i];
             return TRUE;
         }
-        else 
+        else
         {
             CharsetItem *rev = BuildReverseTable(out_tbl);
-            CharsetItem *item, key;
-            
-            for (i = 0; i < 128; i++)  
+            CharsetItem *item;
+            CharsetItem key;
+
+            for (i = 0; i < 128; i++)
             {
                 key.u = in_tbl[i];
                 item = (CharsetItem*) bsearch(&key, rev, 128, sizeof(CharsetItem), CompareCharsetItems);
                 if (item == NULL && method == wxCONVERT_SUBSTITUTE)
-                    item = (CharsetItem*) bsearch(&key, encoding_unicode_fallback, 
+                    item = (CharsetItem*) bsearch(&key, encoding_unicode_fallback,
                                 encoding_unicode_fallback_count, sizeof(CharsetItem), CompareCharsetItems);
                 if (item)
                     m_Table[128 + i] = (tchar)item -> c;
                 else
-                    m_Table[128 + i] = 128 + i; // don't know => don't touch
+#if wxUSE_WCHAR_T
+                    m_Table[128 + i] = (wchar_t)(128 + i);
+#else
+                    m_Table[128 + i] = (char)(128 + i);
+#endif                                 
             }
-            
+
             delete[] rev;
             return TRUE;
         }
@@ -174,9 +181,9 @@ void wxEncodingConverter::Convert(const char* input, char* output)
         strcpy(output, input);
         return;
     }
-    
+
     wxASSERT_MSG(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!"));
-       
+
     for (i = input, o = output; *i != 0;)
         *(o++) = (char)(m_Table[(wxUint8)*(i++)]);
     *o = 0;
@@ -200,9 +207,9 @@ void wxEncodingConverter::Convert(const char* input, wchar_t* output)
         *o = 0;
         return;
     }
-    
+
     wxASSERT_MSG(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!"));
-       
+
     for (i = input, o = output; *i != 0;)
         *(o++) = (wchar_t)(m_Table[(wxUint8)*(i++)]);
     *o = 0;
@@ -225,9 +232,9 @@ void wxEncodingConverter::Convert(const wchar_t* input, char* output)
         *o = 0;
         return;
     }
-    
+
     wxASSERT_MSG(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!"));
-       
+
     for (i = input, o = output; *i != 0;)
         *(o++) = (char)(m_Table[(wxUint16)*(i++)]);
     *o = 0;
@@ -251,9 +258,9 @@ void wxEncodingConverter::Convert(const wchar_t* input, wchar_t* output)
         *o = 0;
         return;
     }
-    
+
     wxASSERT_MSG(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!"));
-       
+
     for (i = input, o = output; *i != 0;)
         *(o++) = (wchar_t)(m_Table[(wxUint8)*(i++)]);
     *o = 0;
@@ -265,12 +272,12 @@ void wxEncodingConverter::Convert(const wchar_t* input, wchar_t* output)
 wxString wxEncodingConverter::Convert(const wxString& input)
 {
     if (m_JustCopy) return input;
-    
+
     wxString s;
     const wxChar *i;
-    
+
     wxASSERT_MSG(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!"));
-    
+
     if (m_UnicodeInput)
         for (i = input.c_str(); *i != 0; i++)
             s << (wxChar)(m_Table[(wxUint16)*i]);
@@ -287,7 +294,7 @@ wxString wxEncodingConverter::Convert(const wxString& input)
 
 
 // Following tables describe classes of encoding equivalence.
-// 
+//
 
 #define STOP wxFONTENCODING_SYSTEM
 
@@ -296,17 +303,17 @@ wxString wxEncodingConverter::Convert(const wxString& input)
            // max no. of encodings for one language used on one platform
            // Anybody thinks 5 is not enough? ;-)
 
-static wxFontEncoding 
+static wxFontEncoding
     EquivalentEncodings[][NUM_OF_PLATFORMS][ENC_PER_PLATFORM+1] = {
 
     // *** Please put more common encodings as first! ***
 
-    // West European
+    // Western European
     {
         /* unix    */ {wxFONTENCODING_ISO8859_1, wxFONTENCODING_ISO8859_15, STOP},
         /* windows */ {wxFONTENCODING_CP1252, STOP},
         /* os2     */ {STOP},
-        /* mac     */ {STOP}   
+        /* mac     */ {STOP}
     },
 
     // Central European
@@ -314,15 +321,15 @@ static wxFontEncoding
         /* unix    */ {wxFONTENCODING_ISO8859_2, STOP},
         /* windows */ {wxFONTENCODING_CP1250, STOP},
         /* os2     */ {STOP},
-        /* mac     */ {STOP}   
+        /* mac     */ {STOP}
     },
-    
+
     // Baltic
     {
-        /* unix    */ {wxFONTENCODING_ISO8859_13, STOP},
+        /* unix    */ {wxFONTENCODING_ISO8859_13, wxFONTENCODING_ISO8859_4, STOP},
         /* windows */ {wxFONTENCODING_CP1257, STOP},
         /* os2     */ {STOP},
-        /* mac     */ {STOP}   
+        /* mac     */ {STOP}
     },
 
     // Hebrew
@@ -330,7 +337,7 @@ static wxFontEncoding
         /* unix    */ {wxFONTENCODING_ISO8859_8, STOP},
         /* windows */ {wxFONTENCODING_CP1255, STOP},
         /* os2     */ {STOP},
-        /* mac     */ {STOP}   
+        /* mac     */ {STOP}
     },
 
     // Greek
@@ -338,7 +345,7 @@ static wxFontEncoding
         /* unix    */ {wxFONTENCODING_ISO8859_7, STOP},
         /* windows */ {wxFONTENCODING_CP1253, STOP},
         /* os2     */ {STOP},
-        /* mac     */ {STOP}   
+        /* mac     */ {STOP}
     },
 
     // Arabic
@@ -346,7 +353,7 @@ static wxFontEncoding
         /* unix    */ {wxFONTENCODING_ISO8859_6, STOP},
         /* windows */ {wxFONTENCODING_CP1256, STOP},
         /* os2     */ {STOP},
-        /* mac     */ {STOP}   
+        /* mac     */ {STOP}
     },
 
     // Turkish
@@ -354,7 +361,7 @@ static wxFontEncoding
         /* unix    */ {wxFONTENCODING_ISO8859_9, STOP},
         /* windows */ {wxFONTENCODING_CP1254, STOP},
         /* os2     */ {STOP},
-        /* mac     */ {STOP}   
+        /* mac     */ {STOP}
     },
 
     // Cyrillic
@@ -362,7 +369,7 @@ static wxFontEncoding
         /* unix    */ {wxFONTENCODING_KOI8, wxFONTENCODING_ISO8859_5, STOP},
         /* windows */ {wxFONTENCODING_CP1251, STOP},
         /* os2     */ {STOP},
-        /* mac     */ {STOP}   
+        /* mac     */ {STOP}
     },
 
     {{STOP},{STOP},{STOP},{STOP}} /* Terminator */
@@ -386,7 +393,7 @@ wxFontEncodingArray wxEncodingConverter::GetPlatformEquivalents(wxFontEncoding e
         platform = wxPLATFORM_MAC;
 #endif
     }
-    
+
     int i, clas, e ;
     wxFontEncoding *f;
     wxFontEncodingArray arr;
@@ -402,11 +409,11 @@ wxFontEncodingArray wxEncodingConverter::GetPlatformEquivalents(wxFontEncoding e
                         if (*f == enc) arr.Add(enc);
                     for (f = EquivalentEncodings[clas][platform]; *f != STOP; f++)
                         if (arr.Index(*f) == wxNOT_FOUND) arr.Add(*f);
-                    i = NUM_OF_PLATFORMS/*hack*/; break; 
+                    i = NUM_OF_PLATFORMS/*hack*/; break;
                 }
         clas++;
     }
-    
+
     return arr;
 }
 
@@ -417,7 +424,7 @@ wxFontEncodingArray wxEncodingConverter::GetAllEquivalents(wxFontEncoding enc)
     int i, clas, e, j ;
     wxFontEncoding *f;
     wxFontEncodingArray arr;
-    
+
     arr = GetPlatformEquivalents(enc); // we want them to be first items in array
 
     clas = 0;
@@ -428,12 +435,14 @@ wxFontEncodingArray wxEncodingConverter::GetAllEquivalents(wxFontEncoding enc)
                 if (EquivalentEncodings[clas][i][e] == enc)
                 {
                     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);                            
-                    i = NUM_OF_PLATFORMS/*hack*/; break; 
+                        for (f = EquivalentEncodings[clas][j]; *f != STOP; f++)
+                            if (arr.Index(*f) == wxNOT_FOUND) arr.Add(*f);
+                    i = NUM_OF_PLATFORMS/*hack*/; break;
                 }
         clas++;
     }
-    
+
     return arr;
 }
+
+#endif // wxUSE_FONTMAP