bug fixes for using wxTransientPopupWindow and wxDP_ALLOWNONE support from Andreas...

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

diff --git a/include/wx/wx_cwc.h b/include/wx/wx_cwc.h
index ea8911edf0d86bc3a51ba9eb3e8e205eaa29ee07..c1fa2c6b54ba70ed8e1525f89a8cde9406d25fcf 100644 (file)
--- a/include/wx/wx_cwc.h
+++ b/include/wx/wx_cwc.h
@@ -1,40 +1,48 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx_cw.h
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx_cw.h

-// Purpose:     wxWindows definitions for CodeWarrior builds
+// Purpose:     wxWidgets definitions for CodeWarrior builds

 // Author:      Stefan Csomor
 // Modified by:
 // Created:     12/10/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     12/10/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CW__
 #define _WX_CW__
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CW__
 #define _WX_CW__
 

-#if __MWERKS__ >= 0x2400
+#if __MWERKS__ >= 0x2400 && __MWERKS__ <= 0x3200

 #pragma old_argmatch on
 #endif
 
 #if __option(profile)
 #ifdef __cplusplus
 #pragma old_argmatch on
 #endif
 
 #if __option(profile)
 #ifdef __cplusplus

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

 #else
 #else

-       #if __POWERPC__
-               #include <wx_Carbon_prof.mch>
-       #endif
+    #ifdef __MACH__
+        #include <wx_Mach_prof.mch>
+    #elif __POWERPC__
+        #include <wx_Carbon_prof.mch>
+    #endif

 #endif
 #else
 #ifdef __cplusplus
 #endif
 #else
 #ifdef __cplusplus

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

 #else
 #else

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

 #endif
 #endif
 #endif
 #endif
 #endif
 #endif