CanAcceptFocus() now returns true if either the window itself or one of its children...

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

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 2f5e5318fae835defaa50d139ace9486c8a74991..8de9c989796b3badd7f41d7d89f0f69c960379a2 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -34,6 +34,12 @@
 #        define __WXMAC_OSX__
 #        define __WXMAC_CARBON__
 #        include <AvailabilityMacros.h>
 #        define __WXMAC_OSX__
 #        define __WXMAC_CARBON__
 #        include <AvailabilityMacros.h>

+#        ifndef MAC_OS_X_VERSION_10_4
+#           define MAC_OS_X_VERSION_10_4 1040
+#        endif
+#        ifndef MAC_OS_X_VERSION_10_5
+#           define MAC_OS_X_VERSION_10_5 1050
+#        endif

 #        ifdef __WXMAC_XCODE__
 #            include <unistd.h>
 #            include "wx/mac/carbon/config_xcode.h"
 #        ifdef __WXMAC_XCODE__
 #            include <unistd.h>
 #            include "wx/mac/carbon/config_xcode.h"


@@ -351,13 +357,11 @@
 #       endif
 #    endif  /* SGI */
 
 #       endif
 #    endif  /* SGI */
 

-#    if defined(sun) || defined(__SUN__)
-#        ifndef __GNUG__
-#            ifndef __SUNCC__
-#                define __SUNCC__
-#            endif /* Sun CC */
-#        endif
-#    endif /* Sun */
+#    if defined(__SUNPRO_CC)
+#       ifndef __SUNCC__
+#           define __SUNCC__ __SUNPRO_CC
+#       endif /* Sun CC */
+#    endif /* Sun CC */

 
 #    ifdef __EMX__
 #        define OS2EMX_PLAIN_CHAR
 
 #    ifdef __EMX__
 #        define OS2EMX_PLAIN_CHAR


@@ -529,6 +533,10 @@
     #define wxCHECK_GCC_VERSION( major, minor ) 0
 #endif
 
     #define wxCHECK_GCC_VERSION( major, minor ) 0
 #endif
 

+#if defined(__BORLANDC__) || (defined(__GNUC__) && __GNUC__ < 3)
+#define wxNEEDS_CHARPP
+#endif
+

 /*
    This macro can be used to check that the version of mingw32 compiler is
    at least maj.min
 /*
    This macro can be used to check that the version of mingw32 compiler is
    at least maj.min


@@ -548,6 +556,18 @@
 #    define wxCHECK_W32API_VERSION(maj, min) (0)
 #endif
 
 #    define wxCHECK_W32API_VERSION(maj, min) (0)
 #endif
 

+/**
+    This is similar to wxCHECK_GCC_VERSION but for Sun CC compiler.
+ */
+#ifdef __SUNCC__
+    /*
+       __SUNCC__ is 0xVRP where V is major version, R release and P patch level
+     */
+    #define wxCHECK_SUNCC_VERSION(maj, min) (__SUNCC__ >= (((maj)<<8) | ((min)<<4)))
+#else
+    #define wxCHECK_SUNCC_VERSION(maj, min) (0)
+#endif
+

 #if defined (__WXMSW__)
 #    if !defined(__WATCOMC__)
 #        define wxHAVE_RAW_BITMAP
 #if defined (__WXMSW__)
 #    if !defined(__WATCOMC__)
 #        define wxHAVE_RAW_BITMAP