X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a0be6908526c8030fc8649b5d0a42c49ce4585ad..9b2a74693ea0ac096f5099caac4a5ead3268e07f:/include/wx/platform.h diff --git a/include/wx/platform.h b/include/wx/platform.h index a7a9921378..b796ce8ecf 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 @@ -73,6 +72,12 @@ #endif #if defined(__PALMOS__) +# if __PALMOS__ == 0x06000000 +# define __WXPALMOS6__ +# endif +# if __PALMOS__ == 0x05000000 +# define __WXPALMOS5__ +# endif # ifndef __WXPALMOS__ # define __WXPALMOS__ # endif @@ -116,53 +121,6 @@ # ifndef __WIN32__ # 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) -# define __WIN95__ # endif #endif /* Win32 */ @@ -172,12 +130,6 @@ # endif #endif -#ifdef __WINE__ -# ifndef __WIN95__ -# define __WIN95__ -# endif -#endif /* WINE */ - /* detect MS SmartPhone */ #if defined( WIN32_PLATFORM_WFSP ) # ifndef __SMARTPHONE__ @@ -223,6 +175,15 @@ # endif #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. @@ -252,14 +213,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" - -/* check the consistency of the settings in setup.h */ -#include "wx/chkconf.h" /* adjust the Unicode setting: wxUSE_UNICODE should be defined as 0 or 1 @@ -288,9 +241,33 @@ #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 + */ +#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 @@ -309,12 +286,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 @@ -361,6 +339,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__) @@ -425,14 +408,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 */ @@ -471,7 +456,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 */ @@ -503,15 +488,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 /* @@ -533,9 +526,10 @@ at least maj.min */ #if ( defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || \ - defined( __CYGWIN__ ) || \ - (defined(__WATCOMC__) && __WATCOMC__ >= 1200) ) && \ + ( defined( __CYGWIN__ ) && defined( __WINDOWS__ ) ) || \ + wxCHECK_WATCOM_VERSION(1,0) ) && \ !defined(__DOS__) && \ + !defined(__WXPM__) && \ !defined(__WXMOTIF__) && \ !defined(__WXGTK__) && \ !defined(__WXX11__) && \ @@ -553,8 +547,10 @@ #endif #if defined (__WXMAC__) -# ifndef WORDS_BIGENDIAN +# if ( !defined(__MACH__) || ( defined(__BIG_ENDIAN__) && __BIG_ENDIAN__ ) ) # define WORDS_BIGENDIAN 1 +# else +# undef WORDS_BIGENDIAN # endif #endif @@ -602,4 +598,3 @@ #endif #endif /* _WX_PLATFORM_H_ */ -