X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2ca2357dedb9a43bd4c0f9c01e8e7ed6bf19a2d2..f321ab7fb40525098cea6594ffbf2daf0186b1a3:/include/wx/platform.h?ds=sidebyside diff --git a/include/wx/platform.h b/include/wx/platform.h index 1b6b013d9b..faeaf6fd20 100644 --- a/include/wx/platform.h +++ b/include/wx/platform.h @@ -33,6 +33,13 @@ # if defined(__MACH__) # define __WXMAC_OSX__ # define __WXMAC_CARBON__ +# include +# 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 # include "wx/mac/carbon/config_xcode.h" @@ -72,6 +79,12 @@ #endif #if defined(__PALMOS__) +# if __PALMOS__ == 0x06000000 +# define __WXPALMOS6__ +# endif +# if __PALMOS__ == 0x05000000 +# define __WXPALMOS5__ +# endif # ifndef __WXPALMOS__ # define __WXPALMOS__ # endif @@ -169,6 +182,10 @@ # endif #endif +#if defined(__POCKETPC__) || defined(__SMARTPHONE__) || defined(__WXGPE__) +# define __WXHANDHELD__ +#endif + /* Include wx/setup.h for the Unix platform defines generated by configure and the library compilation options @@ -510,10 +527,17 @@ ... 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) ) ) ) +#if defined(__GNUC__) && defined(__GNUC_MINOR__) + #define wxCHECK_GCC_VERSION( major, minor ) \ + ( ( __GNUC__ > (major) ) \ + || ( __GNUC__ == (major) && __GNUC_MINOR__ >= (minor) ) ) +#else + #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 @@ -543,6 +567,8 @@ #if defined (__WXMAC__) # if ( !defined(__MACH__) || ( defined(__BIG_ENDIAN__) && __BIG_ENDIAN__ ) ) # define WORDS_BIGENDIAN 1 +# else +# undef WORDS_BIGENDIAN # endif #endif