X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e84f7290001cedb44e0a3a3d7536f4de3bf505cd..7198c3368055d88249a338eb33b21f051f674806:/src/common/encconv.cpp

diff --git a/src/common/encconv.cpp b/src/common/encconv.cpp
index da88c09d52..fdfa64eb6a 100644
--- a/src/common/encconv.cpp
+++ b/src/common/encconv.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        encconv.cpp
+// Name:        src/common/encconv.cpp
 // Purpose:     wxEncodingConverter class for converting between different
 //              font encodings
 // Author:      Vaclav Slavik
@@ -25,14 +25,8 @@
     #include "unictabl.inc"
 #endif
 
-#if wxUSE_WCHAR_T
-    typedef wchar_t tchar;
-#else
-    typedef char tchar;
-#endif
-
 #ifdef __WXMAC__
-    #include "wx/mac/corefoundation/cfstring.h"
+    #include "wx/osx/core/cfstring.h"
     #include <CoreFoundation/CFStringEncodingExt.h>
 
     wxUint16 gMacEncodings[wxFONTENCODING_MACMAX-wxFONTENCODING_MACMIN+1][128] ;
@@ -51,11 +45,11 @@ static const wxUint16* GetEncTable(wxFontEncoding enc)
         int i = enc-wxFONTENCODING_MACMIN ;
         if ( gMacEncodingsInited[i] == false )
         {
-            // create 
+            // 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 );
@@ -84,12 +78,14 @@ typedef struct {
     wxUint8  c;
 } CharsetItem;
 
-extern "C" int wxCMPFUNC_CONV
+extern "C"
+{
+static int wxCMPFUNC_CONV
 CompareCharsetItems(const void *i1, const void *i2)
 {
     return ( ((CharsetItem*)i1) -> u - ((CharsetItem*)i2) -> u );
 }
-
+}
 
 static CharsetItem* BuildReverseTable(const wxUint16 *tbl)
 {
@@ -120,11 +116,7 @@ bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_e
     const wxUint16 *in_tbl;
     const wxUint16 *out_tbl = NULL;
 
-    if (m_Table) {delete[] m_Table; m_Table = 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;}
 
@@ -135,18 +127,18 @@ bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_e
     {
         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)0;
+        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++)
-                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++)
-            m_Table[out_tbl[i]] = (tchar)(128 + i);
+            m_Table[out_tbl[i]] = (wchar_t)(128 + i);
 
         m_UnicodeInput = true;
     }
@@ -158,12 +150,12 @@ bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_e
 
         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)
         {
-            for (i = 0; i < 128; i++)  m_Table[128 + i] = (tchar)in_tbl[i];
+            for (i = 0; i < 128; i++)  m_Table[128 + i] = (wchar_t)in_tbl[i];
             return true;
         }
         else // output !Unicode
@@ -180,13 +172,9 @@ 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)
-                    m_Table[128 + i] = (tchar)item -> c;
+                    m_Table[128 + i] = (wchar_t)item -> c;
                 else
-#if wxUSE_WCHAR_T
                     m_Table[128 + i] = (wchar_t)(128 + i);
-#else
-                    m_Table[128 + i] = (char)(128 + i);
-#endif
             }
 
             delete[] rev;
@@ -197,11 +185,11 @@ bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_e
 }
 
 
-#define REPLACEMENT_CHAR  ((tchar)'?')
+#define REPLACEMENT_CHAR  (L'?')
 
-inline tchar GetTableValue(const tchar *table, tchar value, bool& repl)
+inline wchar_t GetTableValue(const wchar_t *table, wchar_t value, bool& repl)
 {
-    tchar r = table[value];
+    wchar_t r = table[value];
     if (r == 0 && value != 0)
     {
         r = REPLACEMENT_CHAR;
@@ -238,8 +226,6 @@ bool wxEncodingConverter::Convert(const char* input, char* output) const
 }
 
 
-#if wxUSE_WCHAR_T
-
 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*!"));
@@ -321,7 +307,7 @@ bool wxEncodingConverter::Convert(const wchar_t* input, wchar_t* output) const
                 wxT("You must call wxEncodingConverter::Init() before actually converting!"));
 
     bool replaced = false;
-    
+
     for (i = input, o = output; *i != 0;)
         *(o++) = (wchar_t)(GetTableValue(m_Table, (wxUint8)*(i++), replaced));
     *o = 0;
@@ -329,8 +315,6 @@ bool wxEncodingConverter::Convert(const wchar_t* input, wchar_t* output) const
     return !replaced;
 }
 
-#endif // wxUSE_WCHAR_T
-
 
 wxString wxEncodingConverter::Convert(const wxString& input) const
 {