fixed gcc warnings and reformatted some pieces of code to be a bit readable

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

diff --git a/include/wx/wx_cwc.h b/include/wx/wx_cwc.h
index 830a0ca271b2dd29ac7cb1cc60e9560244dd1764..8fa963af549b9728265f1138c2966f2cf477c779 100644 (file)
--- a/include/wx/wx_cwc.h
+++ b/include/wx/wx_cwc.h
@@ -12,23 +12,35 @@
 #ifndef _WX_CW__
 #define _WX_CW__
 
 #ifndef _WX_CW__
 #define _WX_CW__
 

+#if __MWERKS__ >= 0x2400
+#pragma old_argmatch on
+#endif
+

 #if __option(profile)
 #ifdef __cplusplus
 #if __option(profile)
 #ifdef __cplusplus

-       #if __POWERPC__
+       #ifdef __MACH__
+               #include <wx_Mach++_prof.mch>
+       #elif __POWERPC__

                #include <wx_Carbon++_prof.mch>
        #endif
 #else
                #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
                #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
                #include <wx_Carbon++.mch>
        #endif
 #else

-       #if __POWERPC__
+       #ifdef __MACH__
+               #include <wx_Mach.mch>
+       #elif __POWERPC__

                #include <wx_Carbon.mch>
        #endif
 #endif
                #include <wx_Carbon.mch>
        #endif
 #endif