on xcode native we end up with several definitions otherwise

[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 581bb4f3bb5238bbf4fddd53f6179f05e998420c..946039517862170f5dc28534c00052e93975dffe 100644 (file)
--- a/include/wx/wx_cw_cm.h
+++ b/include/wx/wx_cw_cm.h
@@ -1,12 +1,16 @@
 #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
 
@@ -42,12 +46,7 @@
 #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
-         #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>