Digital Mars compilation warnings and Unicode fixes (patch 884587)

[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 b5649cd4a0e303b4e6f91974bd84f36d030922b7..47bdc7a0390f97672b78f5c2a2bc30b22084c549 100644 (file)
--- a/include/wx/wx_cwc_d.h
+++ b/include/wx/wx_cwc_d.h
@@ -12,15 +12,23 @@
 #ifndef _WX_CW__
 #define _WX_CW__
 
+#if __MWERKS__ >= 0x2400 && __MWERKS__ <= 0x3200
+#pragma old_argmatch on
+#endif
+
 #if __option(profile)
 #error "profiling is not supported in debug versions"
 #else
 #ifdef __cplusplus
-       #if __POWERPC__
+       #ifdef __MACH__
+               #include <wx_Mach++_d.mch>
+       #elif __POWERPC__
                #include <wx_Carbon++_d.mch>
        #endif
 #else
-       #if __POWERPC__
+       #ifdef __MACH__
+               #include <wx_Mach_d.mch>
+       #elif __POWERPC__
                #include <wx_Carbon_d.mch>
        #endif
 #endif