mach-o addition

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

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); }
-#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 ); \

include/wx/filefn.h

@@ -31,7 +31,7 @@
 #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;
@@ -43,7 +43,7 @@
     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
 

include/wx/wx_cw_cm.h

@@ -10,7 +10,7 @@
 #pragma old_argmatch on
 #endif
 
-#if (__MWERKS__ < 0x0900) || macintosh
+#if (__MWERKS__ < 0x0900) || macintosh || __MACH__
     #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
-    #ifdef __WXDEBUG__
+	  #if defined( __WXDEBUG__ ) && !defined(__MACH__)
         // 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
       /*
       #include <MacTypes.h>
 		#if UNIVERSAL_INTERFACES_VERSION < 0x0340

include/wx/wx_cwc.h

@@ -18,21 +18,29 @@
 
 #if __option(profile)
 #ifdef __cplusplus
-	#if __POWERPC__
+	#ifdef __MACH__
+		#include <wx_Mach++_prof.mch>
+	#elif __POWERPC__
 		#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
-	#if __POWERPC__
+	#ifdef __MACH__
+		#include <wx_Mach++.mch>
+	#elif __POWERPC__
 		#include <wx_Carbon++.mch>
 	#endif
 #else
-	#if __POWERPC__
+	#ifdef __MACH__
+		#include <wx_Mach.mch>
+	#elif __POWERPC__
 		#include <wx_Carbon.mch>
 	#endif
 #endif

include/wx/wx_cwc_d.h

@@ -20,11 +20,15 @@
 #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
-	#if __POWERPC__
+	#ifdef __MACH__
+		#include <wx_Mach_d.mch>
+	#elif __POWERPC__
 		#include <wx_Carbon_d.mch>
 	#endif
 #endif

include/wx_cwc.pch

@@ -1,11 +1,15 @@
 #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
-#if __POWERPC__
+#ifdef __MACH__
+	#pragma precompile_target "wx_Mach.mch"
+#elif __POWERPC__
 	#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
+#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_cwc.pch++

@@ -1,11 +1,15 @@
 #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
-#if __POWERPC__
+#ifdef __MACH__
+	#pragma precompile_target "wx_Mach++.mch"
+#elif __POWERPC__
 	#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
+#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"

include/wx_cwc_d.pch

@@ -1,7 +1,9 @@
 #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"
@@ -13,6 +15,13 @@
 #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_cwc_d.pch++

@@ -1,7 +1,9 @@
 #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"
@@ -15,7 +17,13 @@
 #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"