mach-o addition

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19854 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/app.h b/include/wx/app.h
index 605fbc2ecb5609aac59ca550914b2bc8d5da09f4..ac59394d3af155ec402ca0eb08e8b62ae921da9a 100644 (file)
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -534,7 +534,7 @@ public:
     #define IMPLEMENT_WXWIN_MAIN \
         extern int wxEntry( int argc, char **argv ); \
         int main(int argc, char **argv) { return wxEntry(argc, argv); }
     #define IMPLEMENT_WXWIN_MAIN \
         extern int wxEntry( int argc, char **argv ); \
         int main(int argc, char **argv) { return wxEntry(argc, argv); }

-#elif defined(__WXMAC__) && defined(__UNIX__)
+#elif defined(__WXMAC__)

     // wxMac seems to have a specific wxEntry prototype
     #define IMPLEMENT_WXWIN_MAIN \
         extern int wxEntry( int argc, char **argv, bool enterLoop = TRUE ); \
     // wxMac seems to have a specific wxEntry prototype
     #define IMPLEMENT_WXWIN_MAIN \
         extern int wxEntry( int argc, char **argv, bool enterLoop = TRUE ); \

diff --git a/include/wx/filefn.h b/include/wx/filefn.h
index c34371d988f06f82280799536c75b9145c8eee2d..75313630d8041f3bf35947a878380c5a01734a2d 100644 (file)
--- a/include/wx/filefn.h
+++ b/include/wx/filefn.h
@@ -31,7 +31,7 @@
 #else
 
 // define off_t
 #else
 
 // define off_t

-#if !defined(__WXMAC__) || defined(__UNIX__)
+#if !defined(__WXMAC__) || defined(__UNIX__) || defined(__MACH__)

     #include  <sys/types.h>
 #else
     typedef long off_t;
     #include  <sys/types.h>
 #else
     typedef long off_t;


@@ -43,7 +43,7 @@
     typedef long off_t;
 #elif defined(__SC__)
     typedef long off_t;
     typedef long off_t;
 #elif defined(__SC__)
     typedef long off_t;

-#elif defined(__MWERKS__) && !defined(__INTEL__)
+#elif defined(__MWERKS__) && !defined(__INTEL__) && !defined(__MACH__)

     typedef long off_t;
 #endif
 
     typedef long off_t;
 #endif
 

diff --git a/include/wx/wx_cw_cm.h b/include/wx/wx_cw_cm.h
index c5dd9aef7abb8b82ab7eb982fd05ef3ab395cf2c..21aa30cbab4e4446c0418f9be83e42a028690aef 100644 (file)
--- a/include/wx/wx_cw_cm.h
+++ b/include/wx/wx_cw_cm.h
@@ -10,7 +10,7 @@
 #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__


@@ -42,14 +42,21 @@
 #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
 #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__
+         #if defined( __WXDEBUG__ ) && !defined(__MACH__)

         // otherwise the debugger looses all symbol information
         #define OPAQUE_TOOLBOX_STRUCTS 0
         // 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
+         #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>

     #endif
     #endif

-    #include <ansi_prefix.mac.h>

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

diff --git a/include/wx/wx_cwc.h b/include/wx/wx_cwc.h
index ea8911edf0d86bc3a51ba9eb3e8e205eaa29ee07..8fa963af549b9728265f1138c2966f2cf477c779 100644 (file)
--- a/include/wx/wx_cwc.h
+++ b/include/wx/wx_cwc.h
@@ -18,21 +18,29 @@
 
 #if __option(profile)
 #ifdef __cplusplus
 
 #if __option(profile)
 #ifdef __cplusplus

-       #if __POWERPC__
+       #ifdef __MACH__
+               #include <wx_Mach++_prof.mch>
+       #elif __POWERPC__

                #include <wx_Carbon++_prof.mch>
        #endif
 #else
                #include <wx_Carbon++_prof.mch>
        #endif
 #else

-       #if __POWERPC__
+       #ifdef __MACH__
+               #include <wx_Mach_prof.mch>
+       #elif __POWERPC__

                #include <wx_Carbon_prof.mch>
        #endif
 #endif
 #else
 #ifdef __cplusplus
                #include <wx_Carbon_prof.mch>
        #endif
 #endif
 #else
 #ifdef __cplusplus

-       #if __POWERPC__
+       #ifdef __MACH__
+               #include <wx_Mach++.mch>
+       #elif __POWERPC__

                #include <wx_Carbon++.mch>
        #endif
 #else
                #include <wx_Carbon++.mch>
        #endif
 #else

-       #if __POWERPC__
+       #ifdef __MACH__
+               #include <wx_Mach.mch>
+       #elif __POWERPC__

                #include <wx_Carbon.mch>
        #endif
 #endif
                #include <wx_Carbon.mch>
        #endif
 #endif

diff --git a/include/wx/wx_cwc_d.h b/include/wx/wx_cwc_d.h
index 46a17bc2dc95ed75225d72667171a83199de30f2..6db33689c072980b536cfd8eb3da573c51f4cd6f 100644 (file)
--- a/include/wx/wx_cwc_d.h
+++ b/include/wx/wx_cwc_d.h
@@ -20,11 +20,15 @@
 #error "profiling is not supported in debug versions"
 #else
 #ifdef __cplusplus
 #error "profiling is not supported in debug versions"
 #else
 #ifdef __cplusplus

-       #if __POWERPC__
+       #ifdef __MACH__
+               #include <wx_Mach++_d.mch>
+       #elif __POWERPC__

                #include <wx_Carbon++_d.mch>
        #endif
 #else
                #include <wx_Carbon++_d.mch>
        #endif
 #else

-       #if __POWERPC__
+       #ifdef __MACH__
+               #include <wx_Mach_d.mch>
+       #elif __POWERPC__

                #include <wx_Carbon_d.mch>
        #endif
 #endif
                #include <wx_Carbon_d.mch>
        #endif
 #endif

diff --git a/include/wx_cwc.pch b/include/wx_cwc.pch
index e2416bb3854c5759aaacc142dd8b663762724bdd..c6e0d96ca9747f41d9643fa456f3668decd94ea1 100644 (file)
--- a/include/wx_cwc.pch
+++ b/include/wx_cwc.pch
@@ -1,11 +1,15 @@
 #if __option (profile)
 #if __option (profile)

-#if __POWERPC__
+#ifdef __MACH__
+       #pragma precompile_target "wx_Mach_prof.mch"
+#elif __POWERPC__

        #pragma precompile_target "wx_Carbon_prof.mch"
 #else
        #error "illegal processor for carbon"
 #endif
 #else
        #pragma precompile_target "wx_Carbon_prof.mch"
 #else
        #error "illegal processor for carbon"
 #endif
 #else

-#if __POWERPC__
+#ifdef __MACH__
+       #pragma precompile_target "wx_Mach.mch"
+#elif __POWERPC__

        #pragma precompile_target "wx_Carbon.mch"
 #else
        #error "illegal processor for carbon"
        #pragma precompile_target "wx_Carbon.mch"
 #else
        #error "illegal processor for carbon"


@@ -17,5 +21,12 @@
 #define wxUSE_GUI 1
 #define TARGET_CARBON 1
 #define OLDP2C 1
 #define wxUSE_GUI 1
 #define TARGET_CARBON 1
 #define OLDP2C 1

+#ifdef __MACH__
+       #define __DARWIN__
+       #define __CF_USE_FRAMEWORK_INCLUDES__
+       #define __NOEXTENSIONS__
+       #define __UNIX__
+       #define __UNIX_LIKE__
+#endif

 
 #include "wx/wx_cw_cm.h"
 
 #include "wx/wx_cw_cm.h"

diff --git a/include/wx_cwc.pch++ b/include/wx_cwc.pch++
index c461aa354d7d52f237ea2ce499de434d58ea6ee9..e39a34cefb9902975fd2b9fe237fd014291e6df4 100644 (file)
--- a/include/wx_cwc.pch++
+++ b/include/wx_cwc.pch++
@@ -1,11 +1,15 @@
 #if __option (profile)
 #if __option (profile)

-#if __POWERPC__
+#ifdef __MACH__
+       #pragma precompile_target "wx_Mach++_prof.mch"
+#elif __POWERPC__

        #pragma precompile_target "wx_Carbon++_prof.mch"
 #else
        #error "illegal processor for carbon"
 #endif
 #else
        #pragma precompile_target "wx_Carbon++_prof.mch"
 #else
        #error "illegal processor for carbon"
 #endif
 #else

-#if __POWERPC__
+#ifdef __MACH__
+       #pragma precompile_target "wx_Mach++.mch"
+#elif __POWERPC__

        #pragma precompile_target "wx_Carbon++.mch"
 #else
        #error "illegal processor for carbon"
        #pragma precompile_target "wx_Carbon++.mch"
 #else
        #error "illegal processor for carbon"


@@ -17,6 +21,13 @@
 #define wxUSE_GUI 1
 #define TARGET_CARBON 1
 #define OLDP2C 1
 #define wxUSE_GUI 1
 #define TARGET_CARBON 1
 #define OLDP2C 1

+#ifdef __MACH__
+       #define __DARWIN__
+       #define __CF_USE_FRAMEWORK_INCLUDES__
+       #define __NOEXTENSIONS__
+       #define __UNIX__
+       #define __UNIX_LIKE__
+#endif

 
 #include "wx/wx_cw_cm.h"
 #include "wx/wxprec.h"
\ No newline at end of file
 
 #include "wx/wx_cw_cm.h"
 #include "wx/wxprec.h"
\ No newline at end of file

diff --git a/include/wx_cwc_d.pch b/include/wx_cwc_d.pch
index d067e378f7d8208dad4bef9e4dbc3bab49636de8..631d3c4c13af2ffa92fd2f622eeb1bc120d81ade 100644 (file)
--- a/include/wx_cwc_d.pch
+++ b/include/wx_cwc_d.pch
@@ -1,7 +1,9 @@
 #if __option (profile) 
        #error "profiling is not supported for debug targets"
 #else
 #if __option (profile) 
        #error "profiling is not supported for debug targets"
 #else

-#if __POWERPC__
+#ifdef __MACH__
+       #pragma precompile_target "wx_Mach_d.mch"
+#elif __POWERPC__

        #pragma precompile_target "wx_Carbon_d.mch"
 #else
        #error "illegal processor for carbon"
        #pragma precompile_target "wx_Carbon_d.mch"
 #else
        #error "illegal processor for carbon"


@@ -13,6 +15,13 @@
 #define wxUSE_GUI 1
 #define TARGET_CARBON 1
 #define OLDP2C 1
 #define wxUSE_GUI 1
 #define TARGET_CARBON 1
 #define OLDP2C 1

+#ifdef __MACH__
+       #define __DARWIN__
+       #define __CF_USE_FRAMEWORK_INCLUDES__
+       #define __NOEXTENSIONS__
+       #define __UNIX__
+       #define __UNIX_LIKE__
+#endif

 
 #include "wx/wx_cw_cm.h"
 #ifdef __WXMSW__
 
 #include "wx/wx_cw_cm.h"
 #ifdef __WXMSW__

diff --git a/include/wx_cwc_d.pch++ b/include/wx_cwc_d.pch++
index fce9c9b1b6020e5ec6be523e35d4f8f87f102166..9ab065ece81eb7f8b8551f066fdae2e03a6b9e33 100644 (file)
--- a/include/wx_cwc_d.pch++
+++ b/include/wx_cwc_d.pch++
@@ -1,7 +1,9 @@
 #if __option (profile) 
        #error "profiling is not supported for debug targets"
 #else
 #if __option (profile) 
        #error "profiling is not supported for debug targets"
 #else

-#if __POWERPC__
+#ifdef __MACH__
+       #pragma precompile_target "wx_Mach++_d.mch"
+#elif __POWERPC__

        #pragma precompile_target "wx_Carbon++_d.mch"
 #else
        #error "illegal processor for carbon"
        #pragma precompile_target "wx_Carbon++_d.mch"
 #else
        #error "illegal processor for carbon"


@@ -15,7 +17,13 @@
 #define wxUSE_GUI 1
 #define TARGET_CARBON 1
 #define OLDP2C 1
 #define wxUSE_GUI 1
 #define TARGET_CARBON 1
 #define OLDP2C 1

-
+#ifdef __MACH__
+       #define __DARWIN__
+       #define __CF_USE_FRAMEWORK_INCLUDES__
+       #define __NOEXTENSIONS__
+       #define __UNIX__
+       #define __UNIX_LIKE__
+#endif

 #include "wx/wx_cw_cm.h"
 #ifdef WX_PRECOMP
 #include "wx/wxprec.h"
 #include "wx/wx_cw_cm.h"
 #ifdef WX_PRECOMP
 #include "wx/wxprec.h"