New API for wxdataViewCtrl (doesn't run yet).

[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 f860d0efe1d50f2cad905f2b2fef84df1b8eaaaf..6dab373f566926c178f487ff3cde9e54afb4b9b9 100644 (file)
--- a/include/wx/wx_cw_cm.h
+++ b/include/wx/wx_cw_cm.h
@@ -19,10 +19,12 @@
     #error "this file is only for builds with Metrowerks CodeWarrior"
 #endif
 
     #error "this file is only for builds with Metrowerks CodeWarrior"
 #endif
 

-#define WX_COMP_INLINE_NO_CLASS // defined if the compiler does not want the classname repeated for inlines within a class definition
+// defined if the compiler does not want the classname repeated for inlines
+// within a class definition
+#define WX_COMP_INLINE_NO_CLASS

 
 

-#if __MWERKS__ >= 0x2400 && __MWERKS__ <= 0x3200
-#pragma old_argmatch on
+#if __MWERKS__ >= 0x2400 && __MWERKS__ < 0x3200
+    #pragma old_argmatch on

 #endif
 
 #if (__MWERKS__ < 0x0900) || macintosh || __MACH__
 #endif
 
 #if (__MWERKS__ < 0x0900) || macintosh || __MACH__


@@ -55,18 +57,23 @@
     #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*/
+    /* Set to 0 if you don't want to use precompiled MacHeaders */
+    #define USE_PRECOMPILED_MAC_HEADERS  0

     #define ACCESSOR_CALLS_ARE_FUNCTIONS 1
     #define OPAQUE_TOOLBOX_STRUCTS 1
     #define ACCESSOR_CALLS_ARE_FUNCTIONS 1
     #define OPAQUE_TOOLBOX_STRUCTS 1

-    #ifdef __MACH__
-        #include <ansi_prefix.mach.h>
-        #include <msl_c_version.h>
-        #include <stdint.h>
-        #undef WCHAR_MAX
-        #include <machine/ansi.h>
-    #else
-      #include <ansi_prefix.mac.h>
+
+    /* CW8.3+ has mbstate_t */
+    #if defined(__MACH__) && __MWERKS__ < 0x3003
+        typedef int mbstate_t;
+        #define    _MBSTATE_T
+    #endif
+
+    /* CW8.3+ has ssize_t */
+    #if defined(__MACH__) && __MWERKS__ >= 0x3003
+        #define HAVE_SSIZE_T

     #endif
     #endif

+
+    #include <mslconfig>

     // for getting the correct expat includes
     #define MACOS_CLASSIC
     /*
     // for getting the correct expat includes
     #define MACOS_CLASSIC
     /*