Remove "safety margin" from wxControl::Ellipsize().

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

diff --git a/include/wx/wx_cw_d.h b/include/wx/wx_cw_d.h
index 94d5dd1741efa3a2af319f1584a219b8cef1c07e..feb4c57fcc16458a4f597fd450d810ce66535c50 100644 (file)
--- a/include/wx/wx_cw_d.h
+++ b/include/wx/wx_cw_d.h
@@ -1,18 +1,18 @@
 /////////////////////////////////////////////////////////////////////////////
 // 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
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CW__
 #define _WX_CW__
 
-#if __MWERKS__ >= 0x2400
+#if __MWERKS__ >= 0x2400 && __MWERKS__ < 0x3200
 #pragma old_argmatch on
 #endif
 
@@ -20,25 +20,25 @@
 #error "profiling is not supported in debug versions"
 #else
 #ifdef __cplusplus
-       #if __POWERPC__
-               #include <wx_PPC++_d.mch>
-       #elif __INTEL__
-               #include <wx_x86++_d.mch>
-       #elif __CFM68K__
-               #include <wx_cfm++_d.mch>
-       #else
-               #include <wx_68k++_d.mch>
-       #endif
+    #if __POWERPC__
+        #include <wx_PPC++_d.mch>
+    #elif __INTEL__
+        #include <wx_x86++_d.mch>
+    #elif __CFM68K__
+        #include <wx_cfm++_d.mch>
+    #else
+        #include <wx_68k++_d.mch>
+    #endif
 #else
-       #if __POWERPC__
-               #include <wx_PPC_d.mch>
-       #elif __INTEL__
-               #include <wx_x86_d.mch>
-       #elif __CFM68K__
-               #include <wx_cfm_d.mch>
-       #else
-               #include <wx_68k_d.mch>
-       #endif
+    #if __POWERPC__
+        #include <wx_PPC_d.mch>
+    #elif __INTEL__
+        #include <wx_x86_d.mch>
+    #elif __CFM68K__
+        #include <wx_cfm_d.mch>
+    #else
+        #include <wx_68k_d.mch>
+    #endif
 #endif
 #endif