X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1c415bab65939f4e0c42cfa38b870067f7112513..a4f6fe43c33bd7933645d110ad2719871dab043d:/include/wx/platform.h?ds=inline diff --git a/include/wx/platform.h b/include/wx/platform.h index 0a05b48f4f..9eaffa8a8d 100644 --- a/include/wx/platform.h +++ b/include/wx/platform.h @@ -14,16 +14,6 @@ #ifndef _WX_PLATFORM_H_ #define _WX_PLATFORM_H_ - - -/* - Codewarrior doesn't define any Windows symbols until some headers - are included -*/ -#ifdef __MWERKS__ -# include -#endif - #ifdef __WXMAC_XCODE__ # include # include @@ -37,6 +27,12 @@ # ifndef MAC_OS_X_VERSION_10_6 # define MAC_OS_X_VERSION_10_6 1060 # endif +# ifndef MAC_OS_X_VERSION_10_7 +# define MAC_OS_X_VERSION_10_7 1070 +# endif +# ifndef MAC_OS_X_VERSION_10_8 +# define MAC_OS_X_VERSION_10_8 1080 +# endif # include "wx/osx/config_xcode.h" # ifndef __WXOSX__ # define __WXOSX__ 1 @@ -78,15 +74,11 @@ # endif #endif /* Win32 */ -#if defined(__WXMSW__) +#if defined(_WIN32) # if !defined(__WINDOWS__) # define __WINDOWS__ # endif -# ifndef _WIN32 -# define _WIN32 -# endif - # ifndef WIN32 # define WIN32 # endif @@ -94,7 +86,25 @@ # ifndef __WIN32__ # define __WIN32__ # endif -#endif /* __WXMSW__ */ +#endif /* _WIN32 */ + +/* Don't use widget toolkit specific code in non-GUI code */ +#if defined(wxUSE_GUI) && !wxUSE_GUI +# ifdef __WXMSW__ +# undef __WXMSW__ +# endif +# ifdef __WXGTK__ +# undef __WXGTK__ +# endif +#endif + +#if defined(__WXGTK__) && defined(__WINDOWS__) + +# ifdef __WXMSW__ +# undef __WXMSW__ +# endif + +#endif /* __WXGTK__ && __WINDOWS__ */ /* detect MS SmartPhone */ #if defined( WIN32_PLATFORM_WFSP ) @@ -149,6 +159,11 @@ # define __WXHANDHELD__ #endif +#ifdef __ANDROID__ +# define __WXANDROID__ +# include "wx/android/config_android.h" +#endif + /* Include wx/setup.h for the Unix platform defines generated by configure and the library compilation options @@ -158,15 +173,6 @@ */ #include "wx/setup.h" -#ifdef __GCCXML__ - /* - we're using gccxml to create an XML representation of the entire - 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" -#endif - /* Convenience for any optional classes that use the wxAnyButton base class. */ @@ -231,11 +237,6 @@ # endif #endif /* wxUSE_UNICODE */ -#if defined( __MWERKS__ ) && !defined(__INTEL__) -/* otherwise MSL headers bring in WIN32 dependant APIs */ -#undef UNICODE -#endif - /* test for old versions of Borland C, normally need at least 5.82, Turbo @@ -392,17 +393,6 @@ # endif # endif -/* - OS: Classic Mac OS - */ -#elif defined(applec) || \ - defined(THINK_C) || \ - (defined(__MWERKS__) && !defined(__INTEL__)) - /* MacOS */ -# if !defined(wxSIZE_T_IS_UINT) && !defined(wxSIZE_T_IS_ULONG) -# define wxSIZE_T_IS_ULONG -# endif - /* OS: OS/2 */ @@ -441,9 +431,9 @@ /* define another standard symbol for Microsoft Visual C++: the standard - one (_MSC_VER) is also defined by Metrowerks compiler + one (_MSC_VER) is also defined by some other compilers. */ -# if defined(_MSC_VER) && !defined(__MWERKS__) +# if defined(_MSC_VER) # define __VISUALC__ _MSC_VER /* @@ -464,6 +454,8 @@ # define __VISUALC9__ # elif __VISUALC__ < 1700 # define __VISUALC10__ +# elif __VISUALC__ < 1800 +# define __VISUALC11__ # else # pragma message("Please update wx/platform.h to recognize this VC++ version") # endif @@ -563,7 +555,6 @@ !defined(__DOS__) && \ !defined(__WXPM__) && \ !defined(__WXMOTIF__) && \ - !defined(__WXGTK__) && \ !defined(__WXX11__) # include "wx/msw/gccpriv.h" #else @@ -637,8 +628,7 @@ 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__) \ - || (defined(__DARWIN__) && !wxUSE_GUI) +#if defined(__WXOSX_CARBON__) || defined(__WXOSX_COCOA__) || defined(__WXOSX_IPHONE__) # ifndef __WXOSX__ # define __WXOSX__ 1 # endif @@ -677,6 +667,12 @@ # ifndef MAC_OS_X_VERSION_10_6 # define MAC_OS_X_VERSION_10_6 1060 # endif +# ifndef MAC_OS_X_VERSION_10_7 +# define MAC_OS_X_VERSION_10_7 1070 +# endif +# ifndef MAC_OS_X_VERSION_10_8 +# define MAC_OS_X_VERSION_10_8 1080 +# endif # else # error "only mach-o configurations are supported" # endif @@ -763,7 +759,7 @@ /* Choose which method we will use for updating menus * - in OnIdle, or when we receive a wxEVT_MENU_OPEN event. - * Presently, only Windows and GTK+ support wxEVT_MENU_OPEN. + * Presently, only Windows, OS X and GTK+ support wxEVT_MENU_OPEN. */ #ifndef wxUSE_IDLEMENUUPDATES # if (defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXOSX__)) && !defined(__WXUNIVERSAL__)