X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cdac585c3bb7f5cad3ff095578212a9371fec7f6..558820fd083635d3e1dc026a56b2f14870cb5c38:/include/wx/platform.h diff --git a/include/wx/platform.h b/include/wx/platform.h index 2f5e5318fa..b11bad042a 100644 --- a/include/wx/platform.h +++ b/include/wx/platform.h @@ -20,7 +20,7 @@ are included */ #ifdef __MWERKS__ -# include +# include #endif /* @@ -34,6 +34,12 @@ # 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" @@ -206,7 +212,7 @@ #endif #endif /* ia64 */ -#if defined(_M_MPPC) || defined(__PPC__) +#if defined(_M_MPPC) || defined(__PPC__) || defined(__ppc__) #ifndef __POWERPC__ #define __POWERPC__ #endif @@ -251,6 +257,18 @@ #endif +/* test for old versions of Borland C, normally need at least 5.82, Turbo explorer, + available for free at http://www.turboexplorer.com/downloads +*/ +#if defined(__BORLANDC__) && (__BORLANDC__ < 0x550) +#error "This version of wxWidgets requires a newer version of Borland - we recommend 5.82 (Turbo Explorer); You may at your own risk remove this line and try your system" +#endif /* __BORLANDC__ */ + +#if defined(__BORLANDC__) && (__BORLANDC__ < 0x582) && (__BORLANDC__ > 0x559) +#error "This version of wxWidgets has problems with Borland 5.6; we recommend getting Borland 5.82 (Turbo Explorer); You may at your own risk remove this line and try your system" +#endif /* __BORLANDC__ */ + + /* This macro can be used to test the Open Watcom version. */ @@ -266,43 +284,6 @@ # 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 - 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 - /* OS: first of all, test for MS-DOS platform. We must do this before testing for Unix, because DJGPP compiler defines __unix__ under MS-DOS @@ -325,11 +306,12 @@ /* OS: then test for generic Unix defines, then for particular flavours and finally for Unix-like systems + Mac OS X matches this case (__MACH__), prior Mac OS do not. */ #elif defined(__UNIX__) || defined(__unix) || defined(__unix__) || \ defined(____SVR4____) || defined(__LINUX__) || defined(__sgi) || \ defined(__hpux) || defined(sun) || defined(__SUN__) || defined(_AIX) || \ - defined(__EMX__) || defined(__VMS) || defined(__BEOS__) + defined(__EMX__) || defined(__VMS) || defined(__BEOS__) || defined(__MACH__) # define __UNIX_LIKE__ @@ -351,13 +333,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 @@ -373,6 +353,35 @@ # define wxSIZE_T_IS_UINT # endif # endif + + /* All of these should already be defined by including configure- + generated setup.h but we wish to support Xcode compilation without + requiring the user to define these himself. + */ +# if defined(__APPLE__) && defined(__MACH__) +# ifndef __UNIX__ +# define __UNIX__ 1 +# endif +# ifndef __BSD__ +# define __BSD__ 1 +# endif + /* __DARWIN__ is our own define to mean OS X or pure Darwin */ +# ifndef __DARWIN__ +# define __DARWIN__ 1 +# endif + /* NOTE: TARGET_CARBON is actually a 0/1 and must be 1 for OS X */ +# ifndef TARGET_CARBON +# define TARGET_CARBON 1 +# endif + /* OS X uses unsigned long size_t for both ILP32 and LP64 modes. */ +# if !defined(wxSIZE_T_IS_UINT) && !defined(wxSIZE_T_IS_ULONG) +# define wxSIZE_T_IS_ULONG +# endif +# endif + +/* + OS: Classic Mac OS + */ #elif defined(applec) || \ defined(THINK_C) || \ (defined(__MWERKS__) && !defined(__INTEL__)) @@ -380,38 +389,10 @@ # if !defined(wxSIZE_T_IS_UINT) && !defined(wxSIZE_T_IS_ULONG) # define wxSIZE_T_IS_ULONG # endif -#elif defined(__WXMAC__) && defined(__APPLE__) - /* Mac OS X */ -# define __UNIX_LIKE__ - - /* - These defines are needed when compiling using Project Builder - with a non generated setup0.h - */ -# ifndef __UNIX__ -# define __UNIX__ 1 -# endif -# ifndef __BSD__ -# define __BSD__ 1 -# endif -# ifndef __DARWIN__ -# define __DARWIN__ 1 -# endif -# ifndef __POWERPC__ -# define __POWERPC__ 1 -# endif -# ifndef TARGET_CARBON -# define TARGET_CARBON 1 -# endif -# if !defined(wxSIZE_T_IS_UINT) && !defined(wxSIZE_T_IS_ULONG) -# define wxSIZE_T_IS_ULONG -# endif - /* - Some code has been added to workaround defects(?) in the - bundled gcc compiler. These corrections are identified by - __DARWIN__ for Darwin related corrections (wxMac, wxMotif) - */ +/* + OS: OS/2 + */ #elif defined(__OS2__) /* wxOS2 vs. non wxOS2 ports on OS2 platform */ @@ -432,6 +413,9 @@ # endif # define wxSIZE_T_IS_UINT +/* + OS: Palm OS + */ #elif defined(__PALMOS__) # ifdef __WIN32__ # error "__WIN32__ should not be defined for PalmOS" @@ -443,6 +427,9 @@ # error "__WXMSW__ should not be defined for PalmOS" # endif +/* + OS: Otherwise it must be Windows + */ #else /* Windows */ # ifndef __WINDOWS__ # define __WINDOWS__ @@ -529,6 +516,10 @@ #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 at least maj.min @@ -548,18 +539,87 @@ # 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 # endif #endif -#if defined (__WXMAC__) -# if ( !defined(__MACH__) || ( defined(__BIG_ENDIAN__) && __BIG_ENDIAN__ ) ) -# define WORDS_BIGENDIAN 1 -# else -# undef WORDS_BIGENDIAN -# endif +/* + Handle Darwin gcc universal compilation. Don't do this in an Apple- + specific case since no sane compiler should be defining either + __BIG_ENDIAN__ or __LITTLE_ENDIAN__ unless it really is generating + code that will be hosted on a machine with the appropriate endianness. + If a compiler defines neither, assume the user or configure set + WORDS_BIGENDIAN appropriately. + */ +#if defined(__BIG_ENDIAN__) +# undef WORDS_BIGENDIAN +# define WORDS_BIGENDIAN 1 +#elif defined(__LITTLE_ENDIAN__) +# undef WORDS_BIGENDIAN +#elif defined(__WXMAC__) && !defined(WORDS_BIGENDIAN) +/* According to Stefan even ancient Mac compilers defined __BIG_ENDIAN__ */ +# warning "Compiling wxMac with probably wrong endianness" +#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 + +/* On OpenVMS with the most recent HP C++ compiler some function (i.e. wscanf) + * are only available in the std-namespace. (BUG???) + */ +#if defined( __VMS ) && (__DECCXX_VER >= 70100000) && !defined(__STD_CFRONT) && !defined( __NONAMESPACE_STD ) +# define wxVMS_USE_STD std:: +#else +# define wxVMS_USE_STD #endif /* Choose which method we will use for updating menus