X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8318935126f3860a4d52d58e131af9e9bea8fc9a..1a14587d5907324d280ea6eb2a85e20c0c9654b2:/include/wx/platform.h diff --git a/include/wx/platform.h b/include/wx/platform.h index 38415f572e..06886d705a 100644 --- a/include/wx/platform.h +++ b/include/wx/platform.h @@ -143,36 +143,45 @@ #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 __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 __WINCE_STANDARDSDK__ +# define __WINCE_STANDARDSDK__ +# endif +# ifndef __WXWINCE__ +# define __WXWINCE__ +# endif #endif #if defined(_WIN32_WCE) && !defined(WIN32_PLATFORM_WFSP) && !defined(WIN32_PLATFORM_PSPC) @@ -185,6 +194,9 @@ # define __HANDHELDPC__ # endif # endif +# ifndef __WXWINCE__ +# define __WXWINCE__ +# endif #endif /* @@ -506,5 +518,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_ */