X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0326d9689eb518ff3d8070cd83ea1d36a6f3324f..aa2fc802a96feb1d0ab31034f75ede2840cb0f60:/include/wx/wx_cw_cm.h

diff --git a/include/wx/wx_cw_cm.h b/include/wx/wx_cw_cm.h
index c5dd9aef7a..a577e2860c 100644
--- a/include/wx/wx_cw_cm.h
+++ b/include/wx/wx_cw_cm.h
@@ -1,16 +1,20 @@
-#define MSL_USE_PRECOMPILED_HEADERS	0
-
+#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
 
-#if __MWERKS__ >= 0x2400
+#if __MWERKS__ >= 0x2400 && __MWERKS__ <= 0x3200
 #pragma old_argmatch on
 #endif
 
-#if (__MWERKS__ < 0x0900) || macintosh
+#if (__MWERKS__ < 0x0900) || macintosh || __MACH__
     #define __MAC__
     #define __WXMAC__
 #elif (__MWERKS__ >= 0x0900) && __INTEL__
@@ -25,7 +29,7 @@
 #elif __BEOS__
     #include <ansi_prefix.be.h>
     #include <Be.h>
-#else	
+#else
     #error unknown MW compiler
 #endif
 
@@ -34,42 +38,33 @@
     #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
-    #ifdef __WXDEBUG__
-        // otherwise the debugger looses all symbol information
-        #define OPAQUE_TOOLBOX_STRUCTS 0
-    // #else
-        // enabling opaque toolbox structs under Classic will break access to contrlDefProc (control.cpp)
-        // #define OPAQUE_TOOLBOX_STRUCTS 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>
     #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
-		*/
+    // 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
 
-// in order to avoid problems further down in wxWindows
-
-#ifdef __cplusplus
-
-extern "C" 
-{
-#endif
-	char *strdup(const char *s) ;
-	int	isascii( int c ) ;
-#ifdef __cplusplus
-}
-#endif
-