X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..c01920998145b5248372a124fdcd53f0ba1582d5:/include/wx/platform.h diff --git a/include/wx/platform.h b/include/wx/platform.h index d67532a204..03ae258679 100644 --- a/include/wx/platform.h +++ b/include/wx/platform.h @@ -24,29 +24,32 @@ #endif /* - WXMAC variants - __WXMAC_CLASSIC__ means ppc non-carbon builds, __WXMAC_CARBON__ means - carbon API available (mach or cfm builds) , __WXMAC_OSX__ means mach-o - builds, running under 10.2 + only + WXMAC variants + __WXMAC_CLASSIC__ means ppc non-carbon builds, __WXMAC_CARBON__ means + carbon API available (mach or cfm builds) , __WXMAC_OSX__ means mach-o + builds, running under 10.2 + only */ #ifdef __WXMAC__ - #if defined(__MACH__) - #define __WXMAC_OSX__ 1 - #define __WXMAC_CARBON__ 1 - #define __WXMAC_CLASSIC__ 0 - #ifdef __WXMAC_XCODE__ - #include "wx/mac/carbon/config_xcode.h" - #endif - #else - #define __WXMAC_OSX__ 0 - #if TARGET_CARBON - #define __WXMAC_CARBON__ 1 - #define __WXMAC_CLASSIC__ 0 - #else - #define __WXMAC_CARBON__ 0 - #define __WXMAC_CLASSIC__ 1 - #endif - #endif +# if defined(__MACH__) +# define __WXMAC_OSX__ +# define __WXMAC_CARBON__ +# ifdef __WXMAC_XCODE__ +# include "wx/mac/carbon/config_xcode.h" +# endif +# else +# if TARGET_CARBON +# define __WXMAC_CARBON__ +# else +# define __WXMAC_CLASSIC__ +# endif +# endif +#endif + +/* + __WXOSX__ is a common define to wxMac (Carbon) and wxCocoa ports under OS X. + */ +#if defined(__WXMAC_OSX__) || defined(__WXCOCOA__) +# define __WXOSX__ #endif /* @@ -84,7 +87,8 @@ # endif /* !__WIN64__ */ #endif /* _WIN64 */ -#if defined(_WIN32) || defined(WIN32) || defined(__NT__) || defined(__WXWINCE__) +#if (defined(_WIN32) || defined(WIN32) || defined(__NT__) || defined(__WXWINCE__)) \ + && !defined(__WXMOTIF__) && !defined(__WXGTK__) && !defined(__WXX11__) # ifndef __WXMSW__ # define __WXMSW__ # endif @@ -94,13 +98,46 @@ # endif /* - see MSDN for the description of possible WINVER values, this one is a - good default and, anyhow, we check for most of the features we use - during run-time. - */ -# ifndef WINVER -# define WINVER 0x0400 -# endif + The library user may override the default setting of WINVER by defining + it in his own makefile or project file -- if it is defined, we don't + touch it at all. + + It makes sense to define WINVER as: + - either some lowish value (e.g. 0x0302) to not even compile in the + features not available in Windows version lower than some given + one + - or to a higher value than the one used by default for the given + compiler if you updated its headers to newer version of Platform + SDK, e.g. VC6 ships with 0x0400 headers by default but may also + work with 0x0500 headers and beyond + */ +# ifndef WINVER +# if defined(_MSC_VER) && _MSC_VER < 1300 + /* + VC6 defines some stuff in its default headers which is normally + only present if WINVER >= 0x0500 (FLASHW_XXX constants) which + means that our usual tests not involving WINVER sometimes fail + with it, hence explicitly define a lower WINVER value for it. + */ +# define WINVER 0x0400 +# elif defined(__DMC__) + /* + Digital Mars is distributed with a little outdated headers. + */ +# define WINVER 0x0400 +# else /* !VC++ 6 */ + /* + see MSDN for the description of possible WINVER values, this one + is the highest one defined right now (Windows Server 2003) and + we use it unless it was explicitly overridden by the user to + disable recent features support as we check for all of the + features we use which could be not available on earlier Windows + systems during run-time anyhow, so there is almost no + disadvantage in using it. + */ +# define WINVER 0x0502 +# endif /* VC++ 6/!VC++6 */ +# endif /* Win95 means Win95-style UI, i.e. Win9x/NT 4+ */ # if !defined(__WIN95__) && (WINVER >= 0x0400) @@ -109,22 +146,60 @@ #endif /* Win32 */ #if defined(__WXMSW__) || defined(__WIN32__) -# if !defined(__WINDOWS__) -# define __WINDOWS__ -# endif +# if !defined(__WINDOWS__) +# define __WINDOWS__ +# endif #endif #ifdef __WINE__ -# ifndef __WIN95__ -# define __WIN95__ -# endif +# ifndef __WIN95__ +# define __WIN95__ +# endif #endif /* WINE */ -/* detect SmartPhone */ +/* detect MS SmartPhone */ #if defined( WIN32_PLATFORM_WFSP ) -# ifndef __SMARTPHONE__ -# define __SMARTPHONE__ -# endif +# ifndef __SMARTPHONE__ +# define __SMARTPHONE__ +# endif +# ifndef __WXWINCE__ +# define __WXWINCE__ +# endif +#endif + +/* detect PocketPC */ +#if defined( WIN32_PLATFORM_PSPC ) +# ifndef __POCKETPC__ +# define __POCKETPC__ +# endif +# ifndef __WXWINCE__ +# define __WXWINCE__ +# endif +#endif + +/* detect Standard WinCE SDK */ +#if defined( WCE_PLATFORM_STANDARDSDK ) +# ifndef __WINCE_STANDARDSDK__ +# define __WINCE_STANDARDSDK__ +# endif +# ifndef __WXWINCE__ +# define __WXWINCE__ +# endif +#endif + +#if defined(_WIN32_WCE) && !defined(WIN32_PLATFORM_WFSP) && !defined(WIN32_PLATFORM_PSPC) +# if (_WIN32_WCE >= 400) +# ifndef __WINCE_NET__ +# define __WINCE_NET__ +# endif +# elif (_WIN32_WCE >= 200) +# ifndef __HANDHELDPC__ +# define __HANDHELDPC__ +# endif +# endif +# ifndef __WXWINCE__ +# define __WXWINCE__ +# endif #endif /* @@ -177,7 +252,10 @@ #elif defined(__DMC__) || defined(__WATCOMC__) # undef wxUSE_IOSTREAMH # define wxUSE_IOSTREAMH 1 -#endif /* compilers not supporting iostream.h */ +#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 @@ -352,12 +430,6 @@ # define __UNIX__ #endif /* Unix */ -#if defined(__HPUX__) && !defined(__WXGTK__) -# ifndef __WXMOTIF__ -# define __WXMOTIF__ -# endif /* __WXMOTIF__ */ -#endif - #if defined(__WXMOTIF__) || defined(__WXX11__) # define __X__ #endif @@ -393,10 +465,12 @@ This macro can be used to check that the version of mingw32 compiler is at least maj.min */ -#if ( defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || \ +#if defined(__PALMOS__) +# include "wx/palmos/gccpriv.h" +#elif ( defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || \ defined( __CYGWIN__ ) || \ (defined(__WATCOMC__) && __WATCOMC__ >= 1200) ) && \ - !defined(__DOS__) + !defined(__DOS__) && !defined(__WXMOTIF__) && !defined(__WXGTK__) && !defined(__WXX11__) # include "wx/msw/gccpriv.h" #else # undef wxCHECK_W32API_VERSION @@ -449,5 +523,14 @@ # define wxUSE_WXDIB 1 #endif +/* + We need AvailabilityMacros.h for ifdefing out things that don't exist on + OSX 10.2 and lower + FIXME: We need a better way to detect for 10.3 then including a system header +*/ +#ifdef __DARWIN__ + #include +#endif + #endif /* _WX_PLATFORM_H_ */