made wxCommandEvent::GetInt() return int, not long (patch 1473771)

[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..6ad61566163d88409fa034ac84fa0450a2b6bacc 100644 (file)
--- a/include/wx/wx_cwc_d.h
+++ b/include/wx/wx_cwc_d.h
@@ -1,32 +1,36 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx_cw_d.h
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx_cw_d.h

-// Purpose:     wxWindows definitions for CodeWarrior builds (Debug)
+// Purpose:     wxWidgets definitions for CodeWarrior builds (Debug)

 // 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
-#pragma old_argmatch on
+#if __MWERKS__ >= 0x2400 && __MWERKS__ < 0x3200
+    #pragma old_argmatch on

 #endif
 
 #if __option(profile)
 #error "profiling is not supported in debug versions"
 #else
 #ifdef __cplusplus
 #endif
 
 #if __option(profile)
 #error "profiling is not supported in debug versions"
 #else
 #ifdef __cplusplus

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

 #else
 #else

-       #if __POWERPC__
-               #include <wx_Carbon_d.mch>
-       #endif
+    #ifdef __MACH__
+        #include "wx_Mach_d.mch"
+    #elif __POWERPC__
+        #include "wx_Carbon_d.mch"
+    #endif

 #endif
 #endif
 
 #endif
 #endif