made font a non-pointer; code cleanup

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

diff --git a/include/wx/wx_cwc.h b/include/wx/wx_cwc.h
index ea8911edf0d86bc3a51ba9eb3e8e205eaa29ee07..02456ae97bf0fda15a49ac91c5f8aa5e322bfa44 100644 (file)
--- a/include/wx/wx_cwc.h
+++ b/include/wx/wx_cwc.h
@@ -12,27 +12,35 @@
 #ifndef _WX_CW__
 #define _WX_CW__
 
-#if __MWERKS__ >= 0x2400
+#if __MWERKS__ >= 0x2400 && __MWERKS__ <= 0x3200
 #pragma old_argmatch on
 #endif
 
 #if __option(profile)
 #ifdef __cplusplus
-       #if __POWERPC__
+       #ifdef __MACH__
+               #include <wx_Mach++_prof.mch>
+       #elif __POWERPC__
                #include <wx_Carbon++_prof.mch>
        #endif
 #else
-       #if __POWERPC__
+       #ifdef __MACH__
+               #include <wx_Mach_prof.mch>
+       #elif __POWERPC__
                #include <wx_Carbon_prof.mch>
        #endif
 #endif
 #else
 #ifdef __cplusplus
-       #if __POWERPC__
+       #ifdef __MACH__
+               #include <wx_Mach++.mch>
+       #elif __POWERPC__
                #include <wx_Carbon++.mch>
        #endif
 #else
-       #if __POWERPC__
+       #ifdef __MACH__
+               #include <wx_Mach.mch>
+       #elif __POWERPC__
                #include <wx_Carbon.mch>
        #endif
 #endif