Compile fix for sound without threads. Not sure

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

diff --git a/src/common/encconv.cpp b/src/common/encconv.cpp
index e6b921e027457a83338a6e5b9029c67378f77042..68a6a6d4ebd4c19195e1b79463a4ffa1bcec4a02 100644 (file)
--- a/src/common/encconv.cpp
+++ b/src/common/encconv.cpp
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 
 // conversion tables, generated by scripts in $(WXWIN)/misc/unictabl:
-#ifdef __BORLANDC__
+#if defined( __BORLANDC__ ) || defined(__DARWIN__)
 #include "../common/unictabl.inc"
 #else
 #include "unictabl.inc"
@@ -48,56 +48,39 @@ typedef char tchar;
 #include "TextCommon.h"
 #include "TextEncodingConverter.h"
 
-#include  "wx/mac/private.h"  // includes mac headers
-
-typedef struct {
-    wxFontEncoding enc ;
-    TextEncodingBase mac ;
-} MacCP ;
+#include "wx/fontutil.h"
+#include "wx/mac/private.h"  // includes mac headers
 
-MacCP gMacCodePages[] =
-{
-    wxFONTENCODING_MACROMAN, kTextEncodingMacRoman,
-    wxFONTENCODING_MACCENTRALEUR, kTextEncodingMacCentralEurRoman,
-    wxFONTENCODING_MACHEBREW, kTextEncodingMacHebrew,
-    wxFONTENCODING_MACGREEK, kTextEncodingMacGreek,
-    wxFONTENCODING_MACARABIC, kTextEncodingMacArabic,
-    wxFONTENCODING_MACTURKISH, kTextEncodingMacTurkish,
-    wxFONTENCODING_MACCYRILLIC, kTextEncodingMacCyrillic,
-} ;
-
-wxUint16 gMacEncodings[WXSIZEOF(gMacCodePages)][128] ;
-bool gMacEncodingsInited[WXSIZEOF(gMacCodePages)] ;
+wxUint16 gMacEncodings[wxFONTENCODING_MACMAX-wxFONTENCODING_MACMIN+1][128] ;
+bool gMacEncodingsInited[wxFONTENCODING_MACMAX-wxFONTENCODING_MACMIN+1] ;
 
 #endif
 
 static wxUint16* LINKAGEMODE GetEncTable(wxFontEncoding enc)
 {
 #ifdef __WXMAC__
-    for (int i = 0 ; i < WXSIZEOF(gMacCodePages) ; ++i )
+    if( enc >= wxFONTENCODING_MACMIN && enc <= wxFONTENCODING_MACMAX )
     {
-        if ( gMacCodePages[i].enc == enc )
+        int i = enc-wxFONTENCODING_MACMIN ;
+        if ( gMacEncodingsInited[i] == false )
         {
-            if ( gMacEncodingsInited[i] == false )
-            {
-                TECObjectRef converter ;
-                TextEncodingBase code = gMacCodePages[i].mac ;
-                       TextEncodingBase unicode = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicode16BitFormat) ;
-                   OSStatus status = TECCreateConverter(&converter,code,unicode);
-                   char s[2] ;
-                   s[1] = 0 ;
-                   ByteCount byteInLen, byteOutLen ;
-                   for( char c = 255 ; c >= 128 ; --c )
-                   {
-                       s[0] = c ;
-                       status = TECConvertText(converter, (ConstTextPtr) &s , 1, &byteInLen,
-                       (TextPtr) &gMacEncodings[i][c-128] , 2, &byteOutLen);
-                   }
-                   status = TECDisposeConverter(converter);
-                   gMacEncodingsInited[i]=true;        
-            }
-            return gMacEncodings[i] ;
+            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 ;
+           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);
+           }
+            status = TECDisposeConverter(converter);
+            gMacEncodingsInited[i]=true;       
         }
+        return gMacEncodings[i] ;
     }
 #endif