don't draw borders for bitmap buttons with wxBORDER_NONE style

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

diff --git a/include/wx/wx_cw.h b/include/wx/wx_cw.h
index c8bf670a268f6dce83a53fe426ab6f5b68a0d21d..2c902ecf5e83cd9b4ad60c50994356deeff74202 100644 (file)
--- a/include/wx/wx_cw.h
+++ b/include/wx/wx_cw.h
@@ -1,38 +1,65 @@
 /////////////////////////////////////////////////////////////////////////////
 // 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
+#pragma old_argmatch on
+#endif
+
+#if __option(profile)

 #ifdef __cplusplus
 #ifdef __cplusplus

-       #if __POWERPC__
-               #include <wx_PPC++.mch>
-       #elif __INTEL__
-               #include <wx_x86++.mch>
-       #elif __CFM68K__
-               #include <wx_cfm++.mch>
-       #else
-               #include <wx_68k++.mch>
-       #endif
+    #if __POWERPC__
+        #include <wx_PPC++_prof.mch>
+    #elif __INTEL__
+        #include <wx_x86++_prof.mch>
+    #elif __CFM68K__
+        #include <wx_cfm++_prof.mch>
+    #else
+        #include <wx_68k++_prof.mch>
+    #endif

 #else
 #else

-       #if __POWERPC__
-               #include <wx_PPC.mch>
-       #elif __INTEL__
-               #include <wx_x86.mch>
-       #elif __CFM68K__
-               #include <wx_cfm.mch>
-       #else
-               #include <wx_68k.mch>
-       #endif
+    #if __POWERPC__
+        #include <wx_PPC_prof.mch>
+    #elif __INTEL__
+        #include <wx_x86_prof.mch>
+    #elif __CFM68K__
+        #include <wx_cfm_prof.mch>
+    #else
+        #include <wx_68k_prof.mch>
+    #endif
+#endif
+#else
+#ifdef __cplusplus
+    #if __POWERPC__
+        #include <wx_PPC++.mch>
+    #elif __INTEL__
+        #include <wx_x86++.mch>
+    #elif __CFM68K__
+        #include <wx_cfm++.mch>
+    #else
+        #include <wx_68k++.mch>
+    #endif
+#else
+    #if __POWERPC__
+        #include <wx_PPC.mch>
+    #elif __INTEL__
+        #include <wx_x86.mch>
+    #elif __CFM68K__
+        #include <wx_cfm.mch>
+    #else
+        #include <wx_68k.mch>
+    #endif
+#endif

 #endif
 #endif

-

 #endif
     // _WX_CW__
 #endif
     // _WX_CW__