safer definitions for wx(U)Int32,16 (taken from intl.cpp)

[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..890b3c0a063af689828e69d588449bb78a4f2755 100644 (file)
--- a/include/wx/wx_cw_cm.h
+++ b/include/wx/wx_cw_cm.h
@@ -1,4 +1,4 @@
-#define MSL_USE_PRECOMPILED_HEADERS    1
+#define MSL_USE_PRECOMPILED_HEADERS    0
 
 #if !defined( __MWERKS__ )
     #error "this file is only for builds with Metrowerks CodeWarrior"
@@ -6,11 +6,13 @@
 
 #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*/
-// automatically includes MacHeaders
 #elif (__MWERKS__ >= 0x0900) && __INTEL__
     #define __WXMSW__
     #define __WINDOWS__
@@ -27,19 +29,37 @@
 #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>
+         #define       USE_PRECOMPILED_MAC_HEADERS     0  /*Set to 0 if you don't want to use precompiled MacHeaders*/
+         #define ACCESSOR_CALLS_ARE_FUNCTIONS 1
+         #ifdef __WXDEBUG__
+         // otherwise the debugger looses all symbol information
+    #define OPAQUE_TOOLBOX_STRUCTS 0
+         #else
+    #define OPAQUE_TOOLBOX_STRUCTS 1
+    #endif
+      #include <ansi_prefix.mac.h>
+      /*
+      #include <MacTypes.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
+
 // in order to avoid problems further down in wxWindows
 
 #ifdef __cplusplus
+
 extern "C" 
 {
 #endif