X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3656eefc89abedde388adf8aad72f4f0c107db58..d9bd1a73ff69143ddc205d71e1953e8f26fd573d:/include/wx/platform.h?ds=inline diff --git a/include/wx/platform.h b/include/wx/platform.h index 4db7828771..957c26b2ae 100644 --- a/include/wx/platform.h +++ b/include/wx/platform.h @@ -28,15 +28,48 @@ #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 + WXOSX targets + __WXOSX_MAC__ means Mac OS X, non embedded + __WXOSX_IPHONE__ means OS X iPhone */ -#ifdef __WXMAC__ + +/* + Normally all of __WXOSX_XXX__, __WXOSX__ and __WXMAC__ are defined by + configure but ensure that we also define them if configure was not used for + whatever reason. + + The primare symbol remains __WXOSX_XXX__ one, __WXOSX__ exists to allow + checking for any OS X port (Carbon and Cocoa) and __WXMAC__ is an old name + for it. + */ +#if defined(__WXOSX_CARBON__) || defined(__WXOSX_COCOA__) || defined(__WXOSX_IPHONE__) +# ifndef __WXOSX__ +# define __WXOSX__ 1 +# endif +# ifndef __WXMAC__ +# define __WXMAC__ 1 +# endif +#endif + +#ifdef __WXOSX__ +/* setup precise defines according to sdk used */ +# include +# if defined(__WXOSX_IPHONE__) +# if !( defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE ) +# error "incorrect SDK for an iPhone build" +# endif +# elif defined(__WXOSX_CARBON__) || defined(__WXOSX_COCOA__) +# if !( defined(TARGET_OS_MAC) && TARGET_OS_MAC ) +# error "incorrect SDK for a Mac OS X build" +# endif +# define __WXOSX_MAC__ 1 +# else +# error "one of __WXOSX_IPHONE__, __WXOSX_CARBON__ or __WXOSX_COCOA__ must be defined" +# endif +#endif + +#ifdef __WXOSX_MAC__ # if defined(__MACH__) -# define __WXMAC_OSX__ -# define __WXMAC_CARBON__ /* for backwards compat in user code still defined */ # include # ifndef MAC_OS_X_VERSION_10_4 # define MAC_OS_X_VERSION_10_4 1040 @@ -44,19 +77,22 @@ # ifndef MAC_OS_X_VERSION_10_5 # define MAC_OS_X_VERSION_10_5 1050 # endif +# ifndef MAC_OS_X_VERSION_10_6 +# define MAC_OS_X_VERSION_10_6 1060 +# endif # else # error "only mach-o configurations are supported" # endif #endif /* - __WXOSX__ is a common define to wxMac (Carbon) and wxCocoa ports under OS X. + __WXOSX_OR_COCOA__ is a common define to wxOSX (Carbon or Cocoa) and wxCocoa ports under OS X. DO NOT use this define in base library code. Although wxMac has its own - private base library (and thus __WXOSX__,__WXMAC__ and related defines are + private base library (and thus __WXOSX_OR_COCOA__,__WXMAC__ and related defines are valid there), wxCocoa shares its library with other ports like wxGTK and wxX11. - To keep wx authors from screwing this up, only enable __WXOSX__ for wxCocoa when + To keep wx authors from screwing this up, only enable __WXOSX_OR_COCOA__ for wxCocoa when not compiling the base library. We determine this by first checking if wxUSE_BASE is not defined. If it is not defined, then we're not buildling the base library, and possibly not building wx at all (but actually building @@ -68,14 +104,16 @@ using OS X libraries like Carbon or CoreServices. */ -#if defined(__WXMAC_OSX__) || (defined(__WXCOCOA__) && (!defined(wxUSE_BASE) || !wxUSE_BASE)) || defined(__WXASPEN__) -# define __WXOSX__ +#if defined(__WXOSX__) || (defined(__WXCOCOA__) && (!defined(wxUSE_BASE) || !wxUSE_BASE)) +# define __WXOSX_OR_COCOA__ 1 #endif -#ifdef __WXOSX__ +#ifdef __WXOSX_OR_COCOA__ # ifdef __WXMAC_XCODE__ # include -# include "wx/mac/config_xcode.h" +# include +# include +# include "wx/osx/config_xcode.h" # endif #endif /* @@ -86,14 +124,6 @@ # ifndef __WXMSW__ # define __WXMSW__ # endif - -# ifndef _WIN32 -# define _WIN32 -# endif - -# ifndef WIN32 -# define WIN32 -# endif #endif #if defined(__PALMOS__) @@ -143,17 +173,25 @@ # ifndef __WXMSW__ # define __WXMSW__ # endif - -# ifndef __WIN32__ -# define __WIN32__ -# endif #endif /* Win32 */ -#if defined(__WXMSW__) || defined(__WIN32__) +#if defined(__WXMSW__) # if !defined(__WINDOWS__) # define __WINDOWS__ # endif -#endif + +# ifndef _WIN32 +# define _WIN32 +# endif + +# ifndef WIN32 +# define WIN32 +# endif + +# ifndef __WIN32__ +# define __WIN32__ +# endif +#endif /* __WXMSW__ */ /* detect MS SmartPhone */ #if defined( WIN32_PLATFORM_WFSP ) @@ -200,6 +238,10 @@ # endif #endif +#if defined(__WXWINCE__) && defined(_MSC_VER) && (_MSC_VER == 1201) + #define __EVC4__ +#endif + #if defined(__POCKETPC__) || defined(__SMARTPHONE__) || defined(__WXGPE__) # define __WXHANDHELD__ #endif @@ -211,16 +253,18 @@ Note that it must be included before defining hardware symbols below as they could be already defined by configure */ +#include "wx/setup.h" + #ifdef __GCCXML__ /* we're using gccxml to create an XML representation of the entire - wxWidgets interface; pass it a special setup.h file + wxWidgets interface; use a special setup_gccxml.h file to fix some + of the stuff #defined by the real setup.h */ #include "wx/setup_gccxml.h" -#else - #include "wx/setup.h" #endif + /* Hardware platform detection. @@ -299,18 +343,22 @@ /* - This macro can be used to test the Open Watcom version. + Define Watcom-specific macros. */ #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" +# define WX_WATCOM_ONLY_CODE( x ) #else +# if __WATCOMC__ < 1200 +# error "Only Open Watcom is supported in this release" +# endif + # 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) ) +# define WX_WATCOM_ONLY_CODE( x ) x #endif /* @@ -370,6 +418,10 @@ # ifdef __EMX__ # define OS2EMX_PLAIN_CHAR +# endif +# if defined(__INNOTEK_LIBC__) + /* Ensure visibility of strnlen declaration */ +# define _GNU_SOURCE # endif /* define __HPUX__ for HP-UX where standard macro is __hpux */ @@ -492,8 +544,10 @@ # define __VISUALC8__ # elif __VISUALC__ < 1600 # define __VISUALC9__ +# elif __VISUALC__ < 1700 +# define __VISUALC10__ # else -# pragma message("Please update this code for the next VC++ version") +# pragma message("Please update wx/platform.h to recognize this VC++ version") # endif # elif defined(__BCPLUSPLUS__) && !defined(__BORLANDC__) @@ -612,15 +666,6 @@ #define wxCHECK_SUNCC_VERSION(maj, min) (0) #endif -#if defined (__WXMSW__) -# if !defined(__WATCOMC__) -# define wxHAVE_RAW_BITMAP -# endif -#endif -#if defined(__WXGTK20__) || defined(__WXMAC__) -# define wxHAVE_RAW_BITMAP -#endif - /* Handle Darwin gcc universal compilation. Don't do this in an Apple- specific case since no sane compiler should be defining either @@ -638,7 +683,24 @@ /* According to Stefan even ancient Mac compilers defined __BIG_ENDIAN__ */ # warning "Compiling wxMac with probably wrong endianness" #endif - +/* also the 32/64 bit universal builds must be handled accordingly */ +#ifdef __DARWIN__ +# ifdef __LP64__ +# undef SIZEOF_VOID_P +# undef SIZEOF_LONG +# undef SIZEOF_SIZE_T +# define SIZEOF_VOID_P 8 +# define SIZEOF_LONG 8 +# define SIZEOF_SIZE_T 8 +# else +# undef SIZEOF_VOID_P +# undef SIZEOF_LONG +# undef SIZEOF_SIZE_T +# define SIZEOF_VOID_P 4 +# define SIZEOF_LONG 4 +# define SIZEOF_SIZE_T 4 +# endif +#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 @@ -714,7 +776,7 @@ */ #ifndef wxUSE_FILECONFIG -# if wxUSE_CONFIG +# if wxUSE_CONFIG && wxUSE_TEXTFILE # define wxUSE_FILECONFIG 1 # else # define wxUSE_FILECONFIG 0