X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ba14d9861d043d53cc53ea70a2fab4146f7be9f3..2fce94e20c94073fda30327c7c835def4415361c:/include/wx/wx_cw_cm.h

diff --git a/include/wx/wx_cw_cm.h b/include/wx/wx_cw_cm.h
index 760742f751..7498097e0b 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
-
+#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 
 
 #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__
@@ -40,21 +44,31 @@
     #endif
     #endif
 #elif defined( __WXMAC__)
-	  #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
+    #define	USE_PRECOMPILED_MAC_HEADERS	0  /*Set to 0 if you don't want to use precompiled MacHeaders*/
+    #define ACCESSOR_CALLS_ARE_FUNCTIONS 1
+	  #if defined( __WXDEBUG__ ) && !defined(__MACH__)
+        // otherwise the debugger looses all symbol information
+        #define OPAQUE_TOOLBOX_STRUCTS 0
 	  #else
     #define OPAQUE_TOOLBOX_STRUCTS 1
     #endif
+    #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>
-      /*
-      #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
+    // 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