1. moved InheritAttributes() from wxControl to wxWindow

[wxWidgets.git] / include / wx / wx_cwc_d.h

diff --git a/include/wx/wx_cwc_d.h b/include/wx/wx_cwc_d.h
index 46a17bc2dc95ed75225d72667171a83199de30f2..d3e2e4d1502d92f9252c3615be0a8f7027f475a5 100644 (file)
--- a/include/wx/wx_cwc_d.h
+++ b/include/wx/wx_cwc_d.h
@@ -12,7 +12,7 @@
 #ifndef _WX_CW__
 #define _WX_CW__
 
-#if __MWERKS__ >= 0x2400
+#if __MWERKS__ >= 0x2400 && __MWERKS__ <= 0x3200
 #pragma old_argmatch on
 #endif
 
@@ -20,12 +20,16 @@
 #error "profiling is not supported in debug versions"
 #else
 #ifdef __cplusplus
-       #if __POWERPC__
-               #include <wx_Carbon++_d.mch>
+       #ifdef __MACH__
+               #include "wx_Mach++_d.mch"
+       #elif __POWERPC__
+               #include "wx_Carbon++_d.mch"
        #endif
 #else
-       #if __POWERPC__
-               #include <wx_Carbon_d.mch>
+       #ifdef __MACH__
+               #include "wx_Mach_d.mch"
+       #elif __POWERPC__
+               #include "wx_Carbon_d.mch"
        #endif
 #endif
 #endif