fixed bug in wxHtmlWindow: HistoryBack/Forward now correctly preserves last entry...

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

diff --git a/src/common/encconv.cpp b/src/common/encconv.cpp
index 9a1c4867285668feaa74590d18a490bfc0c55d2d..5336da7bf174bb0bdbcf73b18590c4b2cbdd1068 100644 (file)
--- a/src/common/encconv.cpp
+++ b/src/common/encconv.cpp
@@ -29,6 +29,11 @@
 #include "unictabl.inc" 
 #endif
 
 #include "unictabl.inc" 
 #endif
 

+#if wxUSE_WCHAR_T
+typedef wchar_t tchar;
+#else
+typedef char tchar;
+#endif

 
 static wxUint16* LINKAGEMODE GetEncTable(wxFontEncoding enc)
 {
 
 static wxUint16* LINKAGEMODE GetEncTable(wxFontEncoding enc)
 {


@@ -83,7 +88,7 @@ bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_e
 
     if (m_Table) {delete[] m_Table; m_Table = NULL;}
 
 
     if (m_Table) {delete[] m_Table; m_Table = NULL;}
 

-#if !wxUSE_UNICODE
+#if !wxUSE_WCHAR_T

     if (input_enc == wxFONTENCODING_UNICODE || output_enc == wxFONTENCODING_UNICODE) return FALSE;
 #endif
 
     if (input_enc == wxFONTENCODING_UNICODE || output_enc == wxFONTENCODING_UNICODE) return FALSE;
 #endif
 


@@ -96,19 +101,19 @@ bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_e
     {
         if ((out_tbl = GetEncTable(output_enc)) == NULL) return FALSE;
 
     {
         if ((out_tbl = GetEncTable(output_enc)) == NULL) return FALSE;
 

-        m_Table = new wxChar[65536];
-        for (i = 0; i < 128; i++)  m_Table[i] = (wxChar)i; // 7bit ASCII
-        for (i = 128; i < 65536; i++)  m_Table[i] = (wxChar)'?'; 
+        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 '?'
 
         if (method == wxCONVERT_SUBSTITUTE)
         {
             for (i = 0; i < encoding_unicode_fallback_count; i++)
                 // FIXME - this should be character that means `unicode to charset' impossible, not '?'
 
         if (method == wxCONVERT_SUBSTITUTE)
         {
             for (i = 0; i < encoding_unicode_fallback_count; i++)

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

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

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

 
         m_UnicodeInput = TRUE;
         return TRUE;
 
         m_UnicodeInput = TRUE;
         return TRUE;


@@ -122,12 +127,12 @@ bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_e
 
         m_UnicodeInput = FALSE;
         
 
         m_UnicodeInput = FALSE;
         

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

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

-            for (i = 0; i < 128; i++)  m_Table[128 + i] = (wxChar)in_tbl[i]; // wxChar is 2byte now
+            for (i = 0; i < 128; i++)  m_Table[128 + i] = (tchar)in_tbl[i];

             return TRUE;
         }
         else 
             return TRUE;
         }
         else 


@@ -143,7 +148,7 @@ 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] = (wxChar)item -> c;
+                    m_Table[128 + i] = (tchar)item -> c;

                 else
                     m_Table[128 + i] = 128 + i; // don't know => don't touch
             }
                 else
                     m_Table[128 + i] = 128 + i; // don't know => don't touch
             }


@@ -156,42 +161,42 @@ bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_e
 
 
 
 
 
 

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

 {
 {

+    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*!"));
+
+    const char *i;
+    char *o;
+

     if (m_JustCopy)
     {
     if (m_JustCopy)
     {

-        wxStrcpy(output, input);
+        strcpy(output, input);

         return;
     }
     
     wxASSERT_MSG(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!"));
         return;
     }
     
     wxASSERT_MSG(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!"));

-    
-    const wxChar *i;
-    wxChar *o;
-    
-    if (m_UnicodeInput)
-        for (i = input, o = output; *i != 0; i++, o++)
-            *o = (wxChar)(m_Table[(wxUint16)*i]);
-    else
-        for (i = input, o = output; *i != 0; i++, o++)
-            *o = (wxChar)(m_Table[(wxUint8)*i]);
+       
+    for (i = input, o = output; *i != 0;)
+        *(o++) = (char)(m_Table[(wxUint8)*(i++)]);

     *o = 0;
 }
 
 
     *o = 0;
 }
 
 

-#if wxUSE_UNICODE // otherwise wxChar === char
+#if wxUSE_WCHAR_T

 
 

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

 {
 {

+    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*!"));
 
     const char *i;
     wxASSERT_MSG(!m_UnicodeInput, wxT("You cannot convert from unicode if input is const char*!"));
 
     const char *i;

-    wxChar *o;
+    wchar_t *o;

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

-            *(o++) = (wxChar)(*(i++));
+            *(o++) = (wchar_t)(*(i++));

         *o = 0;
         return;
     }
         *o = 0;
         return;
     }


@@ -199,17 +204,18 @@ void wxEncodingConverter::Convert(const char* input, wxChar* output)
     wxASSERT_MSG(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!"));
        
     for (i = input, o = output; *i != 0;)
     wxASSERT_MSG(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!"));
        
     for (i = input, o = output; *i != 0;)

-        *(o++) = (wxChar)(m_Table[(wxUint8)*(i++)]);
+        *(o++) = (wchar_t)(m_Table[(wxUint8)*(i++)]);

     *o = 0;
 }
 
 
 
     *o = 0;
 }
 
 
 

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

 {
     wxASSERT_MSG(!m_UnicodeOutput, wxT("You cannot convert to unicode if output 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 8-bit if input is const wchar_t*!"));

 
 

-    const wxChar *i;
+    const wchar_t *i;

     char *o;
 
     if (m_JustCopy)
     char *o;
 
     if (m_JustCopy)


@@ -222,39 +228,38 @@ void wxEncodingConverter::Convert(const wxChar* input, char* output)
     
     wxASSERT_MSG(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!"));
        
     
     wxASSERT_MSG(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!"));
        

-    if (m_UnicodeInput)
-        for (i = input, o = output; *i != 0; i++, o++)
-            *o = (char)(m_Table[(wxUint16)*i]);
-    else
-        for (i = input, o = output; *i != 0; i++, o++)
-            *o = (char)(m_Table[(wxUint8)*i]);
+    for (i = input, o = output; *i != 0;)
+        *(o++) = (char)(m_Table[(wxUint16)*(i++)]);

     *o = 0;
 }
 
 
 
     *o = 0;
 }
 
 
 

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

 {
 {

-    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 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*!"));

 
 

-    const char *i;
-    char *o;
+    const wchar_t *i;
+    wchar_t *o;

 
     if (m_JustCopy)
     {
 
     if (m_JustCopy)
     {

-        strcpy(output, input);
+        // wcscpy() is not guaranteed to exist
+        for (i = input, o = output; *i != 0;)
+            *(o++) = (*(i++));
+        *o = 0;

         return;
     }
     
     wxASSERT_MSG(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!"));
        
     for (i = input, o = output; *i != 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[(wxUint8)*(i++)]);
+        *(o++) = (wchar_t)(m_Table[(wxUint8)*(i++)]);

     *o = 0;
 }
 
     *o = 0;
 }
 

-#endif // wxUSE_UNICODE
+#endif // wxUSE_WCHAR_T

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


@@ -287,9 +292,9 @@ 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  3
+#define ENC_PER_PLATFORM  5

            // max no. of encodings for one language used on one platform
            // 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] = {
 
 static wxFontEncoding 
     EquivalentEncodings[][NUM_OF_PLATFORMS][ENC_PER_PLATFORM+1] = {


@@ -354,8 +359,9 @@ static wxFontEncoding
 
     // Cyrillic
     {
 
     // 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}   
     },
         /* os2     */ {STOP},
         /* mac     */ {STOP}   
     },