mach targets added

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

src/jpeg/jconfig.h

@@ -12,9 +12,16 @@
 
 /* use wxWindows' configure */
 #ifdef __MWERKS__
-#if (__MWERKS__ < 0x0900) || macintosh
+#if (__MWERKS__ < 0x0900) || macintosh || defined ( __MACH__ )
     #define __WXMAC__
 		#define USE_MAC_MEMMGR
+	#ifdef __MACH__
+   	  #include <ansi_prefix.mach.h>
+   	  #include <msl_c_version.h>
+   	  #include <stdint.h>
+   	  #undef WCHAR_MAX
+   	  #include <machine/ansi.h>
+	#endif
 // automatically includes MacHeaders
 #elif (__MWERKS__ >= 0x0900) && __INTEL__
     #define __WXMSW__

src/mac/carbon/dc.cpp

@@ -45,7 +45,7 @@ IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
 #define twips2mm        0.0176388888889
 #define mm2pt            2.83464566929
 #define pt2mm            0.352777777778
-#ifndef __DARWIN__
+#if !defined( __DARWIN__ ) || defined(__MWERKS__)
 const double M_PI = 3.14159265358979 ;
 #endif
 const double RAD2DEG  = 180.0 / M_PI;

src/mac/carbon/gsocket.c

@@ -36,7 +36,7 @@
   #include <OpenTransportProviders.h>
   #include <OpenTptInternet.h>
 #endif
-#if TARGET_CARBON
+#if TARGET_CARBON && !defined(OTAssert)
   #define OTAssert( str , cond ) /* does not exists in Carbon */
 #endif
 

src/mac/carbon/main.cpp

@@ -11,8 +11,4 @@
 
 #include "wx/app.h"
 
-WXDLLEXPORT int main(int argc, char* argv[])
-{
-    return wxEntry(argc, argv);
-}
-
+IMPLEMENT_WXWIN_MAIN

src/mac/carbon/utils.cpp

@@ -761,7 +761,7 @@ wxString wxMacCFStringHolder::AsString()
 #if wxUSE_UNICODE
     CFStringGetCharacters( m_cfs , CFRangeMake( 0 , len ) , (UniChar*) buf ) ;
 #else
-    CFStringGetCString( m_cfs , buf , len+1 , s_macDefaultEncodingIsPC ? 
+    CFStringGetCString( m_cfs , buf , len+1 , wxApp::s_macDefaultEncodingIsPC ? 
         kCFStringEncodingWindowsLatin1 : CFStringGetSystemEncoding() ) ;
 #endif
     buf[len] = 0 ;

src/mac/dc.cpp

@@ -45,7 +45,7 @@ IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
 #define twips2mm        0.0176388888889
 #define mm2pt            2.83464566929
 #define pt2mm            0.352777777778
-#ifndef __DARWIN__
+#if !defined( __DARWIN__ ) || defined(__MWERKS__)
 const double M_PI = 3.14159265358979 ;
 #endif
 const double RAD2DEG  = 180.0 / M_PI;

src/mac/gsocket.c

@@ -36,7 +36,7 @@
   #include <OpenTransportProviders.h>
   #include <OpenTptInternet.h>
 #endif
-#if TARGET_CARBON
+#if TARGET_CARBON && !defined(OTAssert)
   #define OTAssert( str , cond ) /* does not exists in Carbon */
 #endif
 

src/mac/main.cpp

@@ -11,8 +11,4 @@
 
 #include "wx/app.h"
 
-WXDLLEXPORT int main(int argc, char* argv[])
-{
-    return wxEntry(argc, argv);
-}
-
+IMPLEMENT_WXWIN_MAIN

src/mac/utils.cpp

@@ -761,7 +761,7 @@ wxString wxMacCFStringHolder::AsString()
 #if wxUSE_UNICODE
     CFStringGetCharacters( m_cfs , CFRangeMake( 0 , len ) , (UniChar*) buf ) ;
 #else
-    CFStringGetCString( m_cfs , buf , len+1 , s_macDefaultEncodingIsPC ? 
+    CFStringGetCString( m_cfs , buf , len+1 , wxApp::s_macDefaultEncodingIsPC ? 
         kCFStringEncodingWindowsLatin1 : CFStringGetSystemEncoding() ) ;
 #endif
     buf[len] = 0 ;

src/regex/regcomp.c

@@ -1,4 +1,4 @@
-#ifdef __MWERKS__
+#if defined(__MWERKS__) && !defined(__MACH__)
 typedef long off_t ;
 #else
 #include <sys/types.h>

src/regex/regerror.c

@@ -1,4 +1,4 @@
-#ifdef __MWERKS__
+#if defined(__MWERKS__) && !defined(__MACH__)
 typedef long off_t ;
 #else
 #include <sys/types.h>

src/regex/regexec.c

@@ -5,7 +5,7 @@
  * macros that code uses.  This lets the same code operate on two different
  * representations for state sets.
  */
-#ifdef __MWERKS__
+#if defined(__MWERKS__) && !defined(__MACH__)
 typedef long off_t ;
 #else
 #include <sys/types.h>

src/regex/regfree.c

@@ -1,4 +1,4 @@
-#ifdef __MWERKS__
+#if defined(__MWERKS__) && !defined(__MACH__)
 typedef long off_t ;
 #else
 #include <sys/types.h>

src/tiff/tif_apple.c

@@ -41,8 +41,15 @@
  * the file first and TIFFOpen'ing it later.
  */
 
+#ifdef __MACH__
+   	  #include <ansi_prefix.mach.h>
+   	  #include <msl_c_version.h>
+   	  #include <stdint.h>
+   	  #undef WCHAR_MAX
+   	  #include <machine/ansi.h>
+#endif
 #include "tiffiop.h"
-#include <Errors.h>
+#include <MacErrors.h>
 #include <Files.h>
 #include <Memory.h>
 

src/tiff/tiffcomp.h

@@ -52,9 +52,13 @@
 #endif
 
 #if defined(__MWERKS__) || defined(THINK_C)
+#ifdef __MACH__
+#include <sys/types.h>
+#else
 #include <unix.h>
 #include <math.h>
 #endif
+#endif
 
 #include <stdio.h>