X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7275146d4d0ee1e2b7b459c383572faec5c4f5c2..c3e54dee9173954a7f18a88632fbc263695938f6:/include/wx/platform.h diff --git a/include/wx/platform.h b/include/wx/platform.h index c78751eee6..faeaf6fd20 100644 --- a/include/wx/platform.h +++ b/include/wx/platform.h @@ -19,7 +19,7 @@ Codewarrior doesn't define any Windows symbols until some headers are included */ -#if __MWERKS__ +#ifdef __MWERKS__ # include #endif @@ -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,19 @@ # 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 + + Note that it must be included before defining hardware symbols below as they + could be already defined by configure + */ +#include "wx/setup.h" + /* Hardware platform detection. @@ -209,11 +224,6 @@ #endif #endif /* alpha */ -/* - Include wx/setup.h for the Unix platform defines generated by configure and - the library compilation options - */ -#include "wx/setup.h" /* adjust the Unicode setting: wxUSE_UNICODE should be defined as 0 or 1 @@ -242,11 +252,26 @@ #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 +/* + 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 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 + /* 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 @@ -325,6 +350,11 @@ */ # define __SGI_CC__ # endif /* gcc/!gcc */ + + /* system headers use this symbol and not __cplusplus in some places */ +# ifndef _LANGUAGE_C_PLUS_PLUS +# define _LANGUAGE_C_PLUS_PLUS +# endif # endif /* SGI */ # if defined(sun) || defined(__SUN__) @@ -389,14 +419,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 */ @@ -435,7 +467,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 */ @@ -467,15 +499,23 @@ # endif #endif -/* Force linking against required libraries under Windows CE: */ -#ifdef __WXWINCE__ -# include "wx/msw/wince/libraries.h" +#ifdef __INTEL_COMPILER +# define __INTELC__ #endif -/* Force inclusion of main PalmOS header: */ -#ifdef __WXPALMOS__ -# include -# undef Abs +/* + We get "Large Files (ILP32) not supported in strict ANSI mode." #error + from HP-UX standard headers when compiling with g++ without this: + */ +#if defined(__HPUX__) && !defined(__STDC_EXT__) +# define __STDC_EXT__ 1 +#endif + +/* Force linking against required libraries under Windows: */ +#ifdef __WXWINCE__ +# include "wx/msw/wince/libraries.h" +#elif defined __WINDOWS__ +# include "wx/msw/libraries.h" #endif /* @@ -487,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 @@ -498,8 +545,9 @@ */ #if ( defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || \ ( defined( __CYGWIN__ ) && defined( __WINDOWS__ ) ) || \ - (defined(__WATCOMC__) && __WATCOMC__ >= 1200) ) && \ + wxCHECK_WATCOM_VERSION(1,0) ) && \ !defined(__DOS__) && \ + !defined(__WXPM__) && \ !defined(__WXMOTIF__) && \ !defined(__WXGTK__) && \ !defined(__WXX11__) && \ @@ -517,8 +565,10 @@ #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 @@ -566,4 +616,3 @@ #endif #endif /* _WX_PLATFORM_H_ */ -