tons of wxFTP fixes and compilation fix for wxBase

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

diff --git a/include/wx/wx_cw_cm.h b/include/wx/wx_cw_cm.h
index 2fe7cf96783d286a3296d5964489bacff194b0f0..a565d4a3f6703cc56d830a698e61d336b637c5eb 100644 (file)
--- a/include/wx/wx_cw_cm.h
+++ b/include/wx/wx_cw_cm.h
@@ -6,19 +6,27 @@
 
 #define WX_COMP_INLINE_NO_CLASS // defined if the compiler does not want the classname repeated for inlines within a class definition
 
 
 #define WX_COMP_INLINE_NO_CLASS // defined if the compiler does not want the classname repeated for inlines within a class definition
 

+#if __MWERKS__ >= 0x2400
+#pragma old_argmatch on
+#endif
+

 #if (__MWERKS__ < 0x0900) || macintosh
     #define __MAC__
     #define __WXMAC__
     #if TARGET_CARBON
            #define     USE_PRECOMPILED_MAC_HEADERS     0  /*Set to 0 if you don't want to use precompiled MacHeaders*/
 #if (__MWERKS__ < 0x0900) || macintosh
     #define __MAC__
     #define __WXMAC__
     #if TARGET_CARBON
            #define     USE_PRECOMPILED_MAC_HEADERS     0  /*Set to 0 if you don't want to use precompiled MacHeaders*/

-                       #ifdef __cplusplus
+               #include "MacHeaders.c"
+       /*
+           #define     USE_PRECOMPILED_MAC_HEADERS     0 
+                       #ifdef __cplusplus

                                        #include <MacHeadersPPCX++>
                        #else
                                        #include <MacHeadersPPCX>
                        #endif
                                        #include <MacHeadersPPCX++>
                        #else
                                        #include <MacHeadersPPCX>
                        #endif

-               #else
-           #define     USE_PRECOMPILED_MAC_HEADERS     1  /*Set to 0 if you don't want to use precompiled MacHeaders*/
-               #endif
+                       */
+       #else
+    #define    USE_PRECOMPILED_MAC_HEADERS     1  /*Set to 0 if you don't want to use precompiled MacHeaders*/         
+    #endif

 // automatically includes MacHeaders
 #elif (__MWERKS__ >= 0x0900) && __INTEL__
     #define __WXMSW__
 // automatically includes MacHeaders
 #elif (__MWERKS__ >= 0x0900) && __INTEL__
     #define __WXMSW__