Unicode compilation fixes.

[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 dd2c3fa06c5fcc4b8f98af0af2e26e6ac1a8a373..a6c9255d8c2a0c5ac4eebce4421f8e4793c1a4ce 100644 (file)
--- a/include/wx/wx_cw_cm.h
+++ b/include/wx/wx_cw_cm.h
@@ -6,10 +6,30 @@
 
 #define WX_COMP_INLINE_NO_CLASS // defined if the compiler does not want the classname repeated for inlines within a class definition
 
+#if __MWERKS__ >= 0x2400
+#pragma old_argmatch on
+#endif
+
 #if (__MWERKS__ < 0x0900) || macintosh
     #define __MAC__
     #define __WXMAC__
-    #define    USE_PRECOMPILED_MAC_HEADERS     1  /*Set to 0 if you don't want to use precompiled MacHeaders*/
+    #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__
@@ -27,19 +47,23 @@
 #ifdef __WXMSW__
     #include <ansi_prefix.win32.h>
     #include <ansi_parms.h>
+    #ifdef __MWERKS__
     #if defined( __MSL__ ) && __MSL__ >= 0x5012
                        #define fileno  _fileno
                        #define fdopen  _fdopen
                        #define tell    _tell
     #endif
+    #endif
 #elif defined( __WXMAC__)
     #include <ansi_prefix.mac.h>
 #endif
 
 #define USE_DEFINE
+
 // in order to avoid problems further down in wxWindows
 
 #ifdef __cplusplus
+
 extern "C" 
 {
 #endif