A few tweaks and cleanups

[wxWidgets.git] / include / wx / platform.h

diff --git a/include/wx/platform.h b/include/wx/platform.h
index f1f6df24dce70fff4dc6e9588046f4f41cc29c77..005719486bc88962e5a8ea9866d572f1c054f22f 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -137,18 +137,6 @@
         #define __HPUX__
     #endif /* HP-UX */
 
         #define __HPUX__
     #endif /* HP-UX */
 

-    #if defined(__WXMAC__) && defined(__DARWIN__)
-        /* Mac OS X */
-
-        /*
-           Some code has been added to workaround defects(?) in the
-           bundled gcc compiler. These corrections are identified by:
-           __DARWIN__ for corrections necessary for Darwin (wxMac, wxMotif)
-         */
-
-        #include <Carbon/Carbon.h>
-    #endif /* __WXMAC__ && __DARWIN__ */
-

     #if defined(__CYGWIN__)
         #if !defined(wxSIZE_T_IS_UINT)
             #define wxSIZE_T_IS_UINT
     #if defined(__CYGWIN__)
         #if !defined(wxSIZE_T_IS_UINT)
             #define wxSIZE_T_IS_UINT


@@ -158,17 +146,32 @@
       defined(THINK_C) || \
       (defined(__MWERKS__) && !defined(__INTEL__))
       /* MacOS */
       defined(THINK_C) || \
       (defined(__MWERKS__) && !defined(__INTEL__))
       /* MacOS */

-#elif defined(__WXMAC__) && defined(__DARWIN__)
+#elif defined(__WXMAC__) && defined(__APPLE__)

     /* Mac OS X */
     #define __UNIX_LIKE__
 
     /* Mac OS X */
     #define __UNIX_LIKE__
 

+    /*
+      These defines are needed when compiling using Project Builder
+      with a non generated setup0.h
+    */
+    #ifndef __UNIX__
+        #define __UNIX__ 1
+    #endif
+    #ifndef __BSD__
+        #define __BSD__ 1
+    #endif
+    #ifndef __DARWIN__
+        #define __DARWIN__ 1
+    #endif
+    #ifndef __POWERPC__
+        #define __POWERPC__ 1
+    #endif
+

     /*
        Some code has been added to workaround defects(?) in the
     /*
        Some code has been added to workaround defects(?) in the

-       bundled gcc compiler. These corrections are identified by:
-       __DARWIN__ for corrections necessary for Darwin (wxMac, wxMotif)
+       bundled gcc compiler. These corrections are identified by
+       __DARWIN__ for Darwin related corrections (wxMac, wxMotif)

      */
      */

-
-    #include <Carbon/Carbon.h>

 #elif defined(__OS2__)
     #if defined(__IBMCPP__)
         #define __VISAGEAVER__ __IBMCPP__
 #elif defined(__OS2__)
     #if defined(__IBMCPP__)
         #define __VISAGEAVER__ __IBMCPP__


@@ -231,7 +234,7 @@
     #endif /* __WXMOTIF__ */
 #endif
 
     #endif /* __WXMOTIF__ */
 #endif
 

-#if defined(__WXMOTIF__)
+#if defined(__WXMOTIF__) || defined(__WXX11__)

     #define __X__
 #endif
 
     #define __X__
 #endif