Derive wxBitmap from wxBitmapBase in wxMotif, with the appropriate

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

diff --git a/include/wx/platform.h b/include/wx/platform.h
index f1f6df24dce70fff4dc6e9588046f4f41cc29c77..68fe507d825c205c1f0fc8ea85081c786db47166 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -18,7 +18,23 @@
    first define Windows symbols if they're not defined on the command line: we
    can autodetect everything we need if _WIN32 is defined
  */
-#if defined(_WIN32) || defined(WIN32) || defined(__NT__)
+#if defined(__CYGWIN32__) && !defined(__WXMOTIF__) && !defined(__WXGTK__) \
+    && !defined(__WXX11__)
+    /* for Cygwin, default to wxMSW unless otherwise specified */
+    #ifndef __WXMSW__
+        #define __WXMSW__
+    #endif
+
+    #ifndef _WIN32
+        #define _WIN32
+    #endif
+
+    #ifndef WIN32
+        #define WIN32
+    #endif
+#endif
+
+#if defined(_WIN32) || defined(WIN32) || defined(__NT__) || defined(__WXWINCE__)
     #ifndef __WXMSW__
         #define __WXMSW__
     #endif
@@ -39,16 +55,10 @@
     #endif
 #endif
 
-#ifdef __WXWINE__
-    #ifndef __WIN32__
-        #define __WIN32__
-    #endif
+#ifdef __WINE__
     #ifndef __WIN95__
         #define __WIN95__
     #endif
-    #ifndef STRICT
-        #define STRICT
-    #endif
 #endif /* WINE */
 
 #if defined(TWIN32) && !defined(__TWIN32__)
@@ -137,19 +147,7 @@
         #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(__CYGWIN__) || defined(__WINE__)
         #if !defined(wxSIZE_T_IS_UINT)
             #define wxSIZE_T_IS_UINT
         #endif
@@ -158,17 +156,38 @@
       defined(THINK_C) || \
       (defined(__MWERKS__) && !defined(__INTEL__))
       /* MacOS */
-#elif defined(__WXMAC__) && defined(__DARWIN__)
+    #if !defined(wxSIZE_T_IS_UINT) && !defined(wxSIZE_T_IS_ULONG)
+        #define wxSIZE_T_IS_ULONG
+    #endif
+#elif defined(__WXMAC__) && defined(__APPLE__)
     /* 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
+
+    #if !defined(wxSIZE_T_IS_UINT) && !defined(wxSIZE_T_IS_ULONG)
+        #define wxSIZE_T_IS_ULONG
+    #endif
     /*
        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__
@@ -231,10 +250,24 @@
     #endif /* __WXMOTIF__ */
 #endif
 
-#if defined(__WXMOTIF__)
+#if defined(__WXMOTIF__) || defined(__WXX11__)
     #define __X__
 #endif
 
+/*
+   This macro can be used to test the gcc version and can be used like this:
+
+    #if wxCHECK_GCC_VERSION(3, 1)
+        ... we have gcc 3.1 or later ...
+    #else
+        ... no gcc at all or gcc < 3.1 ...
+    #endif
+*/
+#define wxCHECK_GCC_VERSION( major, minor ) \
+    ( defined(__GNUC__) && defined(__GNUC_MINOR__) \
+    && ( ( __GNUC__ > (major) ) \
+        || ( __GNUC__ == (major) && __GNUC_MINOR__ >= (minor) ) ) )
+
 /*
    This macro can be used to check that the version of mingw32 compiler is
    at least maj.min