X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/761fbb87fc91e6ed28c0eba41b79aa2ffa8eabfa..c3627a004d0333ec7bfc88e2a397d7d7f9752ea9:/include/wx/platform.h?ds=inline diff --git a/include/wx/platform.h b/include/wx/platform.h index 8ecb13c748..aed9b04776 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 /* @@ -415,12 +427,6 @@ # define __UNIX__ #endif /* Unix */ -#if defined(__HPUX__) && !defined(__WXGTK__) -# ifndef __WXMOTIF__ -# define __WXMOTIF__ -# endif /* __WXMOTIF__ */ -#endif - #if defined(__WXMOTIF__) || defined(__WXX11__) # define __X__ #endif