merge of wxMac into main repository

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index cf69eb531252a3bf70a39bedae3b73403d4a55d0..1e96c7fd2995cc451a27d49e2b88ae5ac57cfcb8 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -691,7 +691,7 @@ typedef float wxFloat32 ;
         = { 0xE158 };
 
     #pragma parameter __D0 wxINT16_SWAP_ALWAYS(__D0)
         = { 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)
         = { 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)
         = { 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
         = { 0xE158, 0x4840, 0xE158 };
 
 #endif

diff --git a/include/wx/gsocket.h b/include/wx/gsocket.h
index 7ec123fd4d79e191ec4fda85652cdf181bce455f..069a531fc37805ffb5cb04db683ad52c60c7e2b5 100644 (file)
--- a/include/wx/gsocket.h
+++ b/include/wx/gsocket.h
@@ -18,7 +18,9 @@
 #if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)
 
 #include <stddef.h>
 #if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)
 
 #include <stddef.h>

+#ifndef __WXMAC__

 #include <sys/types.h>
 #include <sys/types.h>

+#endif

 
 #ifdef __cplusplus
 extern "C" {
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/include/wx/metafile.h b/include/wx/metafile.h
index db81c1f55580f61f285005b33cce98a5f342ff59..fd43ee02c293883f57431d7480abcd8898ff411a 100644 (file)
--- a/include/wx/metafile.h
+++ b/include/wx/metafile.h
@@ -38,6 +38,8 @@
     #endif
 #elif defined(__WXPM__)
     #include "wx/os2/metafile.h"
     #endif
 #elif defined(__WXPM__)
     #include "wx/os2/metafile.h"

+#elif defined(__WXMAC__)
+    #include "wx/mac/metafile.h"

 #endif
 
 #endif
 #endif
 
 #endif

diff --git a/include/wx/statusbr.h b/include/wx/statusbr.h
index 510309de159f3cb6cc4f0f73edfff24d0296c883..6857a952599d0c8c779dec4a5475714d34daf623 100644 (file)
--- a/include/wx/statusbr.h
+++ b/include/wx/statusbr.h
@@ -54,6 +54,10 @@ protected:
     #include "wx/msw/statbr95.h"
 
     typedef wxStatusBar95 wxStatusBarReal;
     #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"
 
 #else
     #include "wx/generic/statusbr.h"
 

diff --git a/include/wx/wx_cw_cm.h b/include/wx/wx_cw_cm.h
index 2fe7cf96783d286a3296d5964489bacff194b0f0..3e25d4e8ce0c0606f3c792a2c3c5c8710522d485 100644 (file)
--- a/include/wx/wx_cw_cm.h
+++ b/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*/
     #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
                                        #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__
 // automatically includes MacHeaders
 #elif (__MWERKS__ >= 0x0900) && __INTEL__
     #define __WXMSW__