merge of wxMac into main repository

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

include/wx/defs.h

@@ -691,7 +691,7 @@ typedef float wxFloat32 ;
         = { 0xE158 };
 
     #pragma parameter __D0 wxINT16_SWAP_ALWAYS(__D0)
-    pascal wxInt16 wxUINT16_SWAP_ALWAYS(wxInt16 value)
+    pascal wxInt16 wxINT16_SWAP_ALWAYS(wxInt16 value)
         = { 0xE158 };
 
     #pragma parameter __D0 wxUINT32_SWAP_ALWAYS (__D0)
@@ -699,7 +699,7 @@ typedef float wxFloat32 ;
         = { 0xE158, 0x4840, 0xE158 };
 
     #pragma parameter __D0 wxINT32_SWAP_ALWAYS (__D0)
-    pascal wxInt32 wxUINT32_SWAP_ALWAYS(wxInt32 value)
+    pascal wxInt32 wxINT32_SWAP_ALWAYS(wxInt32 value)
         = { 0xE158, 0x4840, 0xE158 };
 
 #endif

include/wx/gsocket.h

@@ -18,7 +18,9 @@
 #if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)
 
 #include <stddef.h>
+#ifndef __WXMAC__
 #include <sys/types.h>
+#endif
 
 #ifdef __cplusplus
 extern "C" {

include/wx/metafile.h

@@ -38,6 +38,8 @@
     #endif
 #elif defined(__WXPM__)
     #include "wx/os2/metafile.h"
+#elif defined(__WXMAC__)
+    #include "wx/mac/metafile.h"
 #endif
 
 #endif

include/wx/statusbr.h

@@ -54,6 +54,10 @@ protected:
     #include "wx/msw/statbr95.h"
 
     typedef wxStatusBar95 wxStatusBarReal;
+#elif defined(__WXMAC__)
+    #include "wx/mac/statusbr.h"
+
+    typedef wxStatusBarMac wxStatusBarReal;
 #else
     #include "wx/generic/statusbr.h"
 

include/wx/wx_cw_cm.h

@@ -11,14 +11,18 @@
     #define __WXMAC__
     #if TARGET_CARBON
 	    #define	USE_PRECOMPILED_MAC_HEADERS	0  /*Set to 0 if you don't want to use precompiled MacHeaders*/
-			#ifdef __cplusplus
+		#include "MacHeaders.c"
+    	/*
+	    #define	USE_PRECOMPILED_MAC_HEADERS	0 
+	   		#ifdef __cplusplus
 					#include <MacHeadersPPCX++>
 			#else
 					#include <MacHeadersPPCX>
 			#endif
-		#else
-	    #define	USE_PRECOMPILED_MAC_HEADERS	1  /*Set to 0 if you don't want to use precompiled MacHeaders*/
-		#endif
+			*/
+	#else
+    #define	USE_PRECOMPILED_MAC_HEADERS	1  /*Set to 0 if you don't want to use precompiled MacHeaders*/		
+    #endif
 // automatically includes MacHeaders
 #elif (__MWERKS__ >= 0x0900) && __INTEL__
     #define __WXMSW__