Lots of updates for color dialog and sliders

[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..760742f7512ed3b1ece3a99b7e5554c7f58e551b 100644 (file)
--- a/include/wx/wx_cw_cm.h
+++ b/include/wx/wx_cw_cm.h
@@ -1,4 +1,4 @@
-#define MSL_USE_PRECOMPILED_HEADERS    1
+#define MSL_USE_PRECOMPILED_HEADERS    0

 
 #if !defined( __MWERKS__ )
     #error "this file is only for builds with Metrowerks CodeWarrior"
 
 #if !defined( __MWERKS__ )
     #error "this file is only for builds with Metrowerks CodeWarrior"


@@ -6,24 +6,20 @@
 
 #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 (__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 <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
-// automatically includes MacHeaders

 #elif (__MWERKS__ >= 0x0900) && __INTEL__
 #elif (__MWERKS__ >= 0x0900) && __INTEL__

+    #define WIN32
+    #define _WINDOWS

     #define __WXMSW__
     #define __WINDOWS__
     #define __WIN95__
     #define __WXMSW__
     #define __WINDOWS__
     #define __WIN95__

+    #define __WIN32__

     #define STRICT
     #define NOMINMAX
 #elif __BEOS__
     #define STRICT
     #define NOMINMAX
 #elif __BEOS__


@@ -37,14 +33,28 @@
     #include <ansi_prefix.win32.h>
     #include <ansi_parms.h>
     #ifdef __MWERKS__
     #include <ansi_prefix.win32.h>
     #include <ansi_parms.h>
     #ifdef __MWERKS__

-    #if defined( __MSL__ ) && __MSL__ >= 0x5012
+    #if defined( __MSL__ ) && __MSL__ >= 0x5012 && __MSL__ < 0x7000

                        #define fileno  _fileno
                        #define fdopen  _fdopen
                        #define tell    _tell
     #endif
     #endif
 #elif defined( __WXMAC__)
                        #define fileno  _fileno
                        #define fdopen  _fdopen
                        #define tell    _tell
     #endif
     #endif
 #elif defined( __WXMAC__)

-    #include <ansi_prefix.mac.h>
+         #define       USE_PRECOMPILED_MAC_HEADERS     0  /*Set to 0 if you don't want to use precompiled MacHeaders*/
+         #define ACCESSOR_CALLS_ARE_FUNCTIONS 1
+         #ifdef __WXDEBUG__
+         // otherwise the debugger looses all symbol information
+    #define OPAQUE_TOOLBOX_STRUCTS 0
+         #else
+    #define OPAQUE_TOOLBOX_STRUCTS 1
+    #endif
+      #include <ansi_prefix.mac.h>
+      /*
+      #include <MacTypes.h>
+               #if UNIVERSAL_INTERFACES_VERSION < 0x0340
+                   #error "please update to Apple's lastest universal headers from http://developer.apple.com/sdk/"
+               #endif
+               */

 #endif
 
 #define USE_DEFINE
 #endif
 
 #define USE_DEFINE


@@ -59,6 +69,6 @@ extern "C"
        char *strdup(const char *s) ;
        int     isascii( int c ) ;
 #ifdef __cplusplus
        char *strdup(const char *s) ;
        int     isascii( int c ) ;
 #ifdef __cplusplus

-} ;
+}

 #endif
 
 #endif