Compile fixes.

[wxWidgets.git] / src / mac / carbon / fontutil.cpp

diff --git a/src/mac/carbon/fontutil.cpp b/src/mac/carbon/fontutil.cpp
index e352f7269ec2ec8024a70ffe33d682f845d2b5e9..1aa2298245ec4225ef616c4578e8965e9b886b98 100644 (file)
--- a/src/mac/carbon/fontutil.cpp
+++ b/src/mac/carbon/fontutil.cpp
@@ -36,6 +36,7 @@
 
 #include "wx/fontutil.h"
 #include "wx/fontmap.h"
 
 #include "wx/fontutil.h"
 #include "wx/fontmap.h"

+#include "wx/encinfo.h"

 
 #include "wx/tokenzr.h"
 
 
 #include "wx/tokenzr.h"
 


@@ -102,58 +103,15 @@ bool wxGetNativeFontEncoding(wxFontEncoding encoding,
         encoding = wxFont::GetDefaultEncoding();
     }
 
         encoding = wxFont::GetDefaultEncoding();
     }
 

-    switch ( encoding )
-    {
-        // although this function is supposed to return an exact match, do do
-        // some mappings here for the most common case of "standard" encoding
-        case wxFONTENCODING_SYSTEM:
-        case wxFONTENCODING_ISO8859_1:
-        case wxFONTENCODING_ISO8859_15:
-        case wxFONTENCODING_CP1252:
-            info->charset = 0;
-            break;
-
-        case wxFONTENCODING_CP1250:
-            info->charset = 0;
-            break;
-
-        case wxFONTENCODING_CP1251:
-            info->charset = 0;
-            break;
-
-        case wxFONTENCODING_CP1253:
-            info->charset = 0;
-            break;
-
-        case wxFONTENCODING_CP1254:
-            info->charset = 0;
-            break;
-
-        case wxFONTENCODING_CP1255:
-            info->charset = 0;
-            break;
-
-        case wxFONTENCODING_CP1256:
-            info->charset = 0;
-            break;
-
-        case wxFONTENCODING_CP1257:
-            info->charset = 0;
-            break;
-
-        case wxFONTENCODING_CP437:
-             info->charset = 0;
-           break;
-
-        default:
-            // no way to translate this encoding into a Windows charset
-            return FALSE;
-    }
+    info->encoding = encoding ;

 
     return TRUE;
 }
 
 bool wxTestFontEncoding(const wxNativeEncodingInfo& info)
 {
 
     return TRUE;
 }
 
 bool wxTestFontEncoding(const wxNativeEncodingInfo& info)
 {

-    return TRUE;
+       // basically we should be able to support every encoding via the OS
+    return true ;

 }
 }

+
+