added selecting-while-dragging

[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 890b3c0a063af689828e69d588449bb78a4f2755..21aa30cbab4e4446c0418f9be83e42a028690aef 100644 (file)
--- a/include/wx/wx_cw_cm.h
+++ b/include/wx/wx_cw_cm.h
@@ -10,13 +10,16 @@
 #pragma old_argmatch on
 #endif
 
 #pragma old_argmatch on
 #endif
 

-#if (__MWERKS__ < 0x0900) || macintosh
+#if (__MWERKS__ < 0x0900) || macintosh || __MACH__

     #define __MAC__
     #define __WXMAC__
 #elif (__MWERKS__ >= 0x0900) && __INTEL__
     #define __MAC__
     #define __WXMAC__
 #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__


@@ -30,22 +33,30 @@
     #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__)

-         #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
+    #define    USE_PRECOMPILED_MAC_HEADERS     0  /*Set to 0 if you don't want to use precompiled MacHeaders*/
+    #define ACCESSOR_CALLS_ARE_FUNCTIONS 1
+         #if defined( __WXDEBUG__ ) && !defined(__MACH__)
+        // otherwise the debugger looses all symbol information
+        #define OPAQUE_TOOLBOX_STRUCTS 0

          #else
     #define OPAQUE_TOOLBOX_STRUCTS 1
     #endif
          #else
     #define OPAQUE_TOOLBOX_STRUCTS 1
     #endif

+    #ifdef __MACH__
+         #include <ansi_prefix.mach.h>
+         #include <msl_c_version.h>
+         #include <stdint.h>
+         #undef WCHAR_MAX
+         #include <machine/ansi.h>
+    #else

       #include <ansi_prefix.mac.h>
       #include <ansi_prefix.mac.h>

+    #endif

       /*
       #include <MacTypes.h>
                #if UNIVERSAL_INTERFACES_VERSION < 0x0340
       /*
       #include <MacTypes.h>
                #if UNIVERSAL_INTERFACES_VERSION < 0x0340


@@ -66,6 +77,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