declare wxEntry() as taking char **Argv, not char *argv[]

[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 6221f0e57b1e6da0abd1932b835512b141d609fb..c5dd9aef7abb8b82ab7eb982fd05ef3ab395cf2c 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"


@@ -14,9 +14,12 @@
     #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,19 +33,29 @@
     #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*/
-               #include "MacHeaders.c"
+    #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
+        // enabling opaque toolbox structs under Classic will break access to contrlDefProc (control.cpp)
+        // #define OPAQUE_TOOLBOX_STRUCTS 1
+    #endif

     #include <ansi_prefix.mac.h>
     #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
                #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


@@ -57,6 +70,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