added wx/font.h include to fix PCH-less build

[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 a577e2860c5a10020f0e3fbce59a988bbf0110f4..0fdf7f444ea240d52a3233d403544aba10e2ee32 100644 (file)
--- a/include/wx/wx_cw_cm.h
+++ b/include/wx/wx_cw_cm.h
@@ -1,3 +1,14 @@
+/*
+ Name:        wx/wx_cw_cm.h
+ Purpose:     wxWidgets definitions for CodeWarrior builds
+ Author:      Stefan Csomor
+ Modified by:
+ Created:
+ RCS-ID:      $Id$
+ Copyright:   (c) Stefan Csomor
+ Licence:     wxWindows licence
+*/
+
 #define MSL_USE_PRECOMPILED_HEADERS 0
 #if __WXDEBUG__
     // mac os assert levels
@@ -10,8 +21,8 @@
 
 #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 && __MWERKS__ <= 0x3200
-#pragma old_argmatch on
+#if __MWERKS__ >= 0x2400 && __MWERKS__ < 0x3200
+    #pragma old_argmatch on
 #endif
 
 #if (__MWERKS__ < 0x0900) || macintosh || __MACH__
@@ -47,15 +58,19 @@
     #define USE_PRECOMPILED_MAC_HEADERS  0  /*Set to 0 if you don't want to use precompiled MacHeaders*/
     #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>
+    
+    /*CW9 has mbstate_t*/
+    #if defined(__MACH__) && __MWERKS__ < 0x3200
+               typedef int mbstate_t;
+               #define _MBSTATE_T
     #endif
+    
+    /*CW9 has ssize_t*/
+    #if defined(__MACH__) && __MWERKS__ >= 0x3200
+        #define HAVE_SSIZE_T
+       #endif
+       
+       #include <mslconfig>
     // for getting the correct expat includes
     #define MACOS_CLASSIC
     /*