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 77ae654deeb08efc03aa3ecc539bfe7f858636ed..0fdf7f444ea240d52a3233d403544aba10e2ee32 100644 (file)
--- a/include/wx/wx_cw_cm.h
+++ b/include/wx/wx_cw_cm.h
@@ -1,4 +1,15 @@
-#define MSL_USE_PRECOMPILED_HEADERS    0
+/*
+ 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
     #define DEBUG 1
@@ -6,12 +17,12 @@
 #endif
 #if !defined( __MWERKS__ )
     #error "this file is only for builds with Metrowerks CodeWarrior"
-#endif 
+#endif
 
 #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__
@@ -29,7 +40,7 @@
 #elif __BEOS__
     #include <ansi_prefix.be.h>
     #include <Be.h>
-#else  
+#else
     #error unknown MW compiler
 #endif
 
@@ -38,46 +49,37 @@
     #include <ansi_parms.h>
     #ifdef __MWERKS__
     #if defined( __MSL__ ) && __MSL__ >= 0x5012 && __MSL__ < 0x7000
-                       #define fileno  _fileno
-                       #define fdopen  _fdopen
-                       #define tell    _tell
+            #define fileno _fileno
+            #define fdopen _fdopen
+            #define tell   _tell
     #endif
     #endif
 #elif defined( __WXMAC__)
-    #define    USE_PRECOMPILED_MAC_HEADERS     0  /*Set to 0 if you don't want to use precompiled MacHeaders*/
+    #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
-    // for getting the correct expat includes 
+    
+    /*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
     /*
     #include <MacTypes.h>
-       #if UNIVERSAL_INTERFACES_VERSION < 0x0340
-           #error "please update to Apple's lastest universal headers from http://developer.apple.com/sdk/"
-       #endif
-       */
+    #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 wxWidgets
-
-#ifdef __cplusplus
-
-extern "C" 
-{
-#endif
-       char *strdup(const char *s) ;
-       int     isascii( int c ) ;
-#ifdef __cplusplus
-}
-#endif
-