X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a02bb1438a676a888c1b0e6022ab1494b2643d07..cbeda384e51acb82e13994cb67ac1714669cae10:/include/wx/wx_cw_cm.h?ds=sidebyside

diff --git a/include/wx/wx_cw_cm.h b/include/wx/wx_cw_cm.h
index 3e25d4e8ce..6dab373f56 100644
--- a/include/wx/wx_cw_cm.h
+++ b/include/wx/wx_cw_cm.h
@@ -1,39 +1,48 @@
-#define MSL_USE_PRECOMPILED_HEADERS	1
+/*
+ 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
+    #define DEBUG_INTERNAL 1
+#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
+// 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
+#endif
 
-#if (__MWERKS__ < 0x0900) || macintosh
+#if (__MWERKS__ < 0x0900) || macintosh || __MACH__
     #define __MAC__
     #define __WXMAC__
-    #if TARGET_CARBON
-	    #define	USE_PRECOMPILED_MAC_HEADERS	0  /*Set to 0 if you don't want to use precompiled MacHeaders*/
-		#include "MacHeaders.c"
-    	/*
-	    #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 WIN32
+    #define _WINDOWS
     #define __WXMSW__
     #define __WINDOWS__
     #define __WIN95__
+    #define __WIN32__
     #define STRICT
     #define NOMINMAX
 #elif __BEOS__
     #include <ansi_prefix.be.h>
     #include <Be.h>
-#else	
+#else
     #error unknown MW compiler
 #endif
 
@@ -41,28 +50,39 @@
     #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
+    #if defined( __MSL__ ) && __MSL__ >= 0x5012 && __MSL__ < 0x7000
+            #define fileno _fileno
+            #define fdopen _fdopen
+            #define tell   _tell
     #endif
     #endif
 #elif defined( __WXMAC__)
-    #include <ansi_prefix.mac.h>
-#endif
-
-#define USE_DEFINE
+    /* 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
 
-// in order to avoid problems further down in wxWindows
+    /* CW8.3+ has mbstate_t */
+    #if defined(__MACH__) && __MWERKS__ < 0x3003
+        typedef int mbstate_t;
+        #define    _MBSTATE_T
+    #endif
 
-#ifdef __cplusplus
+    /* CW8.3+ has ssize_t */
+    #if defined(__MACH__) && __MWERKS__ >= 0x3003
+        #define HAVE_SSIZE_T
+    #endif
 
-extern "C" 
-{
-#endif
-	char *strdup(const char *s) ;
-	int	isascii( int c ) ;
-#ifdef __cplusplus
-} ;
+    #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
+    */
 #endif
 
+#define USE_DEFINE
+