X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/17a1ebd101f0653e69736416a2a28d0ada423141..333e57d578e9e0fb6555452b5a53698ffd85ee69:/include/wx/platform.h?ds=sidebyside diff --git a/include/wx/platform.h b/include/wx/platform.h index 606ad4a8d9..2c1a40d943 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 @@ -115,11 +128,6 @@ # ifndef __WIN32__ # define __WIN32__ -# endif - - /* this means Win95-style UI, i.e. Win9x/NT 4+: always true now */ -# if !defined(__WIN95__) -# define __WIN95__ # endif #endif /* Win32 */ @@ -129,12 +137,6 @@ # endif #endif -#ifdef __WINE__ -# ifndef __WIN95__ -# define __WIN95__ -# endif -#endif /* WINE */ - /* detect MS SmartPhone */ #if defined( WIN32_PLATFORM_WFSP ) # ifndef __SMARTPHONE__ @@ -180,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 @@ -246,46 +252,24 @@ #endif /* wxUSE_UNICODE */ #if defined( __MWERKS__ ) && !defined(__INTEL__) -// otherwise MSL headers bring in WIN32 dependant APIs +/* otherwise MSL headers bring in WIN32 dependant APIs */ #undef UNICODE #endif /* - check the consistency of the settings in setup.h: note that this must be - done after setting wxUSE_UNICODE correctly as it is used in wx/chkconf.h - */ -#include "wx/chkconf.h" - - -/* - some compilers don't support iostream.h any longer, while some of theme - are not updated with yet, so override the users setting here - in such case. - */ -#if defined(_MSC_VER) && (_MSC_VER >= 1310) -# undef wxUSE_IOSTREAMH -# define wxUSE_IOSTREAMH 0 -#elif defined(__DMC__) || defined(__WATCOMC__) -# undef wxUSE_IOSTREAMH -# define wxUSE_IOSTREAMH 1 -#elif defined(__MINGW32__) -# undef wxUSE_IOSTREAMH -# define wxUSE_IOSTREAMH 0 -#endif /* compilers with/without iostream.h */ - -/* - old C++ headers (like ) declare classes in the global namespace - while the new, standard ones (like ) do it in std:: namespace, - unless it's an old gcc version. - - using this macro allows constuctions like "wxSTD iostream" to work in - either case - */ -#if !wxUSE_IOSTREAMH && (!defined(__GNUC__) || ( __GNUC__ > 2 ) || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)) -# define wxSTD std:: + This macro can be used to test the Open Watcom version. +*/ +#ifndef __WATCOMC__ +# define wxWATCOM_VERSION(major,minor) 0 +# define wxCHECK_WATCOM_VERSION(major,minor) 0 +# define wxONLY_WATCOM_EARLIER_THAN(major,minor) 0 +#elif defined(__WATCOMC__) && __WATCOMC__ < 1200 +# error "Only Open Watcom is supported in this release" #else -# define wxSTD +# define wxWATCOM_VERSION(major,minor) ( major * 100 + minor * 10 + 1100 ) +# define wxCHECK_WATCOM_VERSION(major,minor) ( __WATCOMC__ >= wxWATCOM_VERSION(major,minor) ) +# define wxONLY_WATCOM_EARLIER_THAN(major,minor) ( __WATCOMC__ < wxWATCOM_VERSION(major,minor) ) #endif /* @@ -336,13 +320,11 @@ # 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 @@ -398,14 +380,16 @@ __DARWIN__ for Darwin related corrections (wxMac, wxMotif) */ #elif defined(__OS2__) + + /* wxOS2 vs. non wxOS2 ports on OS2 platform */ +# if !defined(__WXMOTIF__) && !defined(__WXGTK__) && !defined(__WXX11__) +# ifndef __WXPM__ +# define __WXPM__ +# endif +# endif + # if defined(__IBMCPP__) # define __VISAGEAVER__ __IBMCPP__ -# endif -# ifndef __WXOS2__ -# define __WXOS2__ -# endif -# ifndef __WXPM__ -# define __WXPM__ # endif /* Place other OS/2 compiler environment defines here */ @@ -444,7 +428,7 @@ # define __VISUALC__ _MSC_VER # elif defined(__BCPLUSPLUS__) && !defined(__BORLANDC__) # define __BORLANDC__ -# elif defined(__WATCOMC__) +# elif defined(__WATCOMC__) # elif defined(__SC__) # define __SYMANTECC__ # endif /* compiler */ @@ -488,9 +472,11 @@ # define __STDC_EXT__ 1 #endif -/* Force linking against required libraries under Windows CE: */ +/* Force linking against required libraries under Windows: */ #ifdef __WXWINCE__ # include "wx/msw/wince/libraries.h" +#elif defined __WINDOWS__ +# include "wx/msw/libraries.h" #endif /* @@ -502,10 +488,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 @@ -513,9 +506,9 @@ */ #if ( defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || \ ( defined( __CYGWIN__ ) && defined( __WINDOWS__ ) ) || \ - (defined(__WATCOMC__) && __WATCOMC__ >= 1200) ) && \ + wxCHECK_WATCOM_VERSION(1,0) ) && \ !defined(__DOS__) && \ - !defined(__WXOS2__) && \ + !defined(__WXPM__) && \ !defined(__WXMOTIF__) && \ !defined(__WXGTK__) && \ !defined(__WXX11__) && \ @@ -526,6 +519,18 @@ # 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 @@ -533,11 +538,51 @@ #endif #if defined (__WXMAC__) -# if !defined(WORDS_BIGENDIAN) && ( !defined(__MACH__) || ( defined(__BIG_ENDIAN__) && __BIG_ENDIAN__ ) ) +# if ( !defined(__MACH__) || ( defined(__BIG_ENDIAN__) && __BIG_ENDIAN__ ) ) # define WORDS_BIGENDIAN 1 +# else +# undef WORDS_BIGENDIAN # endif #endif +/* + check the consistency of the settings in setup.h: note that this must be + done after setting wxUSE_UNICODE correctly as it is used in wx/chkconf.h + and after defining the compiler macros which are used in it too + */ +#include "wx/chkconf.h" + + +/* + some compilers don't support iostream.h any longer, while some of theme + are not updated with yet, so override the users setting here + in such case. + */ +#if defined(_MSC_VER) && (_MSC_VER >= 1310) +# undef wxUSE_IOSTREAMH +# define wxUSE_IOSTREAMH 0 +#elif defined(__DMC__) || defined(__WATCOMC__) +# undef wxUSE_IOSTREAMH +# define wxUSE_IOSTREAMH 1 +#elif defined(__MINGW32__) +# undef wxUSE_IOSTREAMH +# define wxUSE_IOSTREAMH 0 +#endif /* compilers with/without iostream.h */ + +/* + old C++ headers (like ) declare classes in the global namespace + while the new, standard ones (like ) do it in std:: namespace, + unless it's an old gcc version. + + using this macro allows constuctions like "wxSTD iostream" to work in + either case + */ +#if !wxUSE_IOSTREAMH && (!defined(__GNUC__) || ( __GNUC__ > 2 ) || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)) +# define wxSTD std:: +#else +# define wxSTD +#endif + /* Choose which method we will use for updating menus * - in OnIdle, or when we receive a wxEVT_MENU_OPEN event. * Presently, only Windows and GTK+ support wxEVT_MENU_OPEN.