added wxEncodingToCodepage() and implemented it properly (using in32 API instead...

[wxWidgets.git] / include / wx / wx_cw_cm.h

diff --git a/include/wx/wx_cw_cm.h b/include/wx/wx_cw_cm.h
index a6c9255d8c2a0c5ac4eebce4421f8e4793c1a4ce..6221f0e57b1e6da0abd1932b835512b141d609fb 100644 (file)
--- a/include/wx/wx_cw_cm.h
+++ b/include/wx/wx_cw_cm.h
@@ -13,24 +13,6 @@
 #if (__MWERKS__ < 0x0900) || macintosh
     #define __MAC__
     #define __WXMAC__
 #if (__MWERKS__ < 0x0900) || macintosh
     #define __MAC__
     #define __WXMAC__

-    #if TARGET_CARBON
-           #define     USE_PRECOMPILED_MAC_HEADERS     0  /*Set to 0 if you don't want to use precompiled MacHeaders*/
-               #include "MacHeaders.c"
-               #if UNIVERSAL_INTERFACES_VERSION < 0x0340
-                   #error "please update to Apple's lastest universal headers from http://developer.apple.com/sdk/"
-               #endif
-       /*
-           #define     USE_PRECOMPILED_MAC_HEADERS     0 
-                       #ifdef __cplusplus
-                                       #include <MacHeadersPPCX++>
-                       #else
-                                       #include <MacHeadersPPCX>
-                       #endif
-                       */
-       #else
-        #define        USE_PRECOMPILED_MAC_HEADERS     1  /*Set to 0 if you don't want to use precompiled MacHeaders*/         
-    #endif
-// automatically includes MacHeaders

 #elif (__MWERKS__ >= 0x0900) && __INTEL__
     #define __WXMSW__
     #define __WINDOWS__
 #elif (__MWERKS__ >= 0x0900) && __INTEL__
     #define __WXMSW__
     #define __WINDOWS__


@@ -55,7 +37,12 @@
     #endif
     #endif
 #elif defined( __WXMAC__)
     #endif
     #endif
 #elif defined( __WXMAC__)

+         #define       USE_PRECOMPILED_MAC_HEADERS     0  /*Set to 0 if you don't want to use precompiled MacHeaders*/
+               #include "MacHeaders.c"

     #include <ansi_prefix.mac.h>
     #include <ansi_prefix.mac.h>

+               #if UNIVERSAL_INTERFACES_VERSION < 0x0340
+                   #error "please update to Apple's lastest universal headers from http://developer.apple.com/sdk/"
+               #endif

 #endif
 
 #define USE_DEFINE
 #endif
 
 #define USE_DEFINE