X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9543e985ff1ac8d10d9c9574343427e1df14bb31..97c58531bf6912d5b6214b4bd6298466ebcb87ca:/include/wx/platform.h?ds=sidebyside diff --git a/include/wx/platform.h b/include/wx/platform.h index 03ae258679..545e5f7a56 100644 --- a/include/wx/platform.h +++ b/include/wx/platform.h @@ -5,7 +5,7 @@ * Modified by: * Created: 29.10.01 (extracted from wx/defs.h) * RCS-ID: $Id$ -* Copyright: (c) 1997-2001 wxWidgets team +* Copyright: (c) 1997-2001 Vadim Zeitlin * Licence: wxWindows licence */ @@ -19,7 +19,7 @@ Codewarrior doesn't define any Windows symbols until some headers are included */ -#if __MWERKS__ +#ifdef __MWERKS__ # include #endif @@ -34,6 +34,7 @@ # define __WXMAC_OSX__ # define __WXMAC_CARBON__ # ifdef __WXMAC_XCODE__ +# include # include "wx/mac/carbon/config_xcode.h" # endif # else @@ -56,9 +57,7 @@ first define Windows symbols if they're not defined on the command line: we can autodetect everything we need if _WIN32 is defined */ -#if defined(__CYGWIN32__) && !defined(__WXMOTIF__) && !defined(__WXGTK__) \ - && !defined(__WXX11__) - /* for Cygwin, default to wxMSW unless otherwise specified */ +#if defined(__CYGWIN__) && defined(__WINDOWS__) # ifndef __WXMSW__ # define __WXMSW__ # endif @@ -72,6 +71,27 @@ # endif #endif +#if defined(__PALMOS__) +# ifndef __WXPALMOS__ +# define __WXPALMOS__ +# endif +# ifdef __WXMSW__ +# undef __WXMSW__ +# endif +# ifdef __WINDOWS__ +# undef __WINDOWS__ +# endif +# ifdef __WIN32__ +# undef __WIN32__ +# endif +# ifdef WIN32 +# undef WIN32 +# endif +# ifdef _WIN32 +# undef _WIN32 +# endif +#endif + #if defined(_WIN64) # ifndef _WIN32 /* @@ -97,50 +117,8 @@ # define __WIN32__ # 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) + /* this means Win95-style UI, i.e. Win9x/NT 4+: always true now */ +# if !defined(__WIN95__) # define __WIN95__ # endif #endif /* Win32 */ @@ -205,11 +183,41 @@ /* 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" -/* check the consistency of the settings in setup.h */ -#include "wx/chkconf.h" +/* + Hardware platform detection. + + VC++ defines _M_xxx symbols. + */ +#if defined(_M_IX86) || defined(i386) || defined(__i386) || defined(__i386__) + #ifndef __INTEL__ + #define __INTEL__ + #endif +#endif /* x86 */ + +#if defined(_M_IA64) + #ifndef __IA64__ + #define __IA64__ + #endif +#endif /* ia64 */ + +#if defined(_M_MPPC) || defined(__PPC__) + #ifndef __POWERPC__ + #define __POWERPC__ + #endif +#endif /* alpha */ + +#if defined(_M_ALPHA) || defined(__AXP__) + #ifndef __ALPHA__ + #define __ALPHA__ + #endif +#endif /* alpha */ + /* adjust the Unicode setting: wxUSE_UNICODE should be defined as 0 or 1 @@ -241,6 +249,15 @@ // 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 @@ -259,12 +276,13 @@ /* old C++ headers (like ) declare classes in the global namespace - while the new, standard ones (like ) do it in std:: 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 +#if !wxUSE_IOSTREAMH && (!defined(__GNUC__) || ( __GNUC__ > 2 ) || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)) # define wxSTD std:: #else # define wxSTD @@ -311,6 +329,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__) @@ -375,14 +398,19 @@ __DARWIN__ for Darwin related corrections (wxMac, wxMotif) */ #elif defined(__OS2__) + + /* wxOS2 vs. non wxOS2 ports on OS2 platform */ +# ifndef __WXMOTIF__ +# ifndef __WXOS2__ +# define __WXOS2__ +# endif +# 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 */ @@ -392,6 +420,17 @@ # endif # define wxSIZE_T_IS_UINT +#elif defined(__PALMOS__) +# ifdef __WIN32__ +# error "__WIN32__ should not be defined for PalmOS" +# endif +# ifdef __WINDOWS__ +# error "__WINDOWS__ should not be defined for PalmOS" +# endif +# ifdef __WXMSW__ +# error "__WXMSW__ should not be defined for PalmOS" +# endif + #else /* Windows */ # ifndef __WINDOWS__ # define __WINDOWS__ @@ -442,6 +481,18 @@ # endif #endif +#ifdef __INTEL_COMPILER +# define __INTELC__ +#endif + +/* + 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 CE: */ #ifdef __WXWINCE__ # include "wx/msw/wince/libraries.h" @@ -465,12 +516,15 @@ This macro can be used to check that the version of mingw32 compiler is at least maj.min */ -#if defined(__PALMOS__) -# include "wx/palmos/gccpriv.h" -#elif ( defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || \ - defined( __CYGWIN__ ) || \ +#if ( defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || \ + ( defined( __CYGWIN__ ) && defined( __WINDOWS__ ) ) || \ (defined(__WATCOMC__) && __WATCOMC__ >= 1200) ) && \ - !defined(__DOS__) && !defined(__WXMOTIF__) && !defined(__WXGTK__) && !defined(__WXX11__) + !defined(__DOS__) && \ + !defined(__WXOS2__) && \ + !defined(__WXMOTIF__) && \ + !defined(__WXGTK__) && \ + !defined(__WXX11__) && \ + !defined(__WXPALMOS__) # include "wx/msw/gccpriv.h" #else # undef wxCHECK_W32API_VERSION @@ -484,7 +538,7 @@ #endif #if defined (__WXMAC__) -# ifndef WORDS_BIGENDIAN +# if !defined(WORDS_BIGENDIAN) && ( !defined(__MACH__) || ( defined(__BIG_ENDIAN__) && __BIG_ENDIAN__ ) ) # define WORDS_BIGENDIAN 1 # endif #endif @@ -524,7 +578,7 @@ #endif /* - We need AvailabilityMacros.h for ifdefing out things that don't exist on + 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 */ @@ -533,4 +587,3 @@ #endif #endif /* _WX_PLATFORM_H_ */ -