Update version to 2.9.4 in version.bkl too and rebake everything.

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

diff --git a/src/common/encconv.cpp b/src/common/encconv.cpp
index a44449dc0d744a516082f79f767c0b3bbbcc888e..fdfa64eb6a0a8e018cf8b79523e4567469a87c39 100644 (file)
--- 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
 // Purpose:     wxEncodingConverter class for converting between different
 //              font encodings
 // Author:      Vaclav Slavik


@@ -25,22 +25,9 @@
     #include "unictabl.inc"
 #endif
 
     #include "unictabl.inc"
 #endif
 

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

 #ifdef __WXMAC__
 #ifdef __WXMAC__

-#ifdef __DARWIN__
-#include <Carbon/Carbon.h>
-#else
-#include <ATSUnicode.h>
-#include <TextCommon.h>
-#include <TextEncodingConverter.h>
-#endif
-    #include "wx/fontutil.h"
-    #include "wx/mac/private.h"  // includes mac headers
+    #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] ;
 
     wxUint16 gMacEncodings[wxFONTENCODING_MACMAX-wxFONTENCODING_MACMIN+1][128] ;
     bool gMacEncodingsInited[wxFONTENCODING_MACMAX-wxFONTENCODING_MACMIN+1] ;


@@ -50,7 +37,7 @@
     #include "wx/msw/wince/missing.h"       // for bsearch()
 #endif
 
     #include "wx/msw/wince/missing.h"       // for bsearch()
 #endif
 

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

 {
 #ifdef __WXMAC__
     if( enc >= wxFONTENCODING_MACMIN && enc <= wxFONTENCODING_MACMAX )
 {
 #ifdef __WXMAC__
     if( enc >= wxFONTENCODING_MACMIN && enc <= wxFONTENCODING_MACMAX )


@@ -58,20 +45,20 @@ static wxUint16* GetEncTable(wxFontEncoding enc)
         int i = enc-wxFONTENCODING_MACMIN ;
         if ( gMacEncodingsInited[i] == false )
         {
         int i = enc-wxFONTENCODING_MACMIN ;
         if ( gMacEncodingsInited[i] == false )
         {

-            TECObjectRef converter ;
-            TextEncodingBase code = wxMacGetSystemEncFromFontEnc( enc ) ;
-            TextEncodingBase unicode = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicode16BitFormat) ;
-            OSStatus status = TECCreateConverter(&converter,code,unicode);
-            char s[2] ;
-            s[1] = 0 ;
-            ByteCount byteInLen, byteOutLen ;
+            // 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 ;
             for( unsigned char c = 255 ; c >= 128 ; --c )
             {
                 s[0] = c ;

-                status = TECConvertText(converter, (ConstTextPtr) &s , 1, &byteInLen,
-                (TextPtr) &gMacEncodings[i][c-128] , 2, &byteOutLen);
+                wxCFStringRef cfref( CFStringCreateWithCStringNoCopy( NULL, s, cfencoding , kCFAllocatorNull ) );
+                CFStringGetCharacters( cfref, firstchar, (UniChar*)  &gMacEncodings[i][c-128] );

             }
             }

-            status = TECDisposeConverter(converter);

             gMacEncodingsInited[i]=true;
         }
         return gMacEncodings[i] ;
             gMacEncodingsInited[i]=true;
         }
         return gMacEncodings[i] ;


@@ -91,14 +78,16 @@ typedef struct {
     wxUint8  c;
 } CharsetItem;
 
     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 );
 }
 CompareCharsetItems(const void *i1, const void *i2)
 {
     return ( ((CharsetItem*)i1) -> u - ((CharsetItem*)i2) -> u );
 }

+}

 
 

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

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


@@ -124,13 +113,10 @@ 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, *out_tbl = NULL;
+    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;}
 
 
     if (input_enc == output_enc) {m_JustCopy = true; return true;}
 


@@ -141,18 +127,18 @@ 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 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++)
 
         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;
     }
 
         m_UnicodeInput = true;
     }


@@ -164,12 +150,12 @@ bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_e
 
         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];
+            for (i = 0; i < 128; i++)  m_Table[128 + i] = (wchar_t)in_tbl[i];

             return true;
         }
         else // output !Unicode
             return true;
         }
         else // output !Unicode


@@ -186,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)
                     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

-#if wxUSE_WCHAR_T

                     m_Table[128 + i] = (wchar_t)(128 + i);
                     m_Table[128 + i] = (wchar_t)(128 + i);

-#else
-                    m_Table[128 + i] = (char)(128 + i);
-#endif

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


@@ -203,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;
     if (r == 0 && value != 0)
     {
         r = REPLACEMENT_CHAR;


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


@@ -327,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;
                 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;
     for (i = input, o = output; *i != 0;)
         *(o++) = (wchar_t)(GetTableValue(m_Table, (wxUint8)*(i++), replaced));
     *o = 0;


@@ -335,8 +315,6 @@ bool wxEncodingConverter::Convert(const wchar_t* input, wchar_t* output) const
     return !replaced;
 }
 
     return !replaced;
 }
 

-#endif // wxUSE_WCHAR_T
-

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


@@ -374,11 +352,12 @@ wxString wxEncodingConverter::Convert(const wxString& input) const
 #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! ***


@@ -477,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;


@@ -504,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