Allow building wxGTK under Windows with MSVC.

Replace a few more __WXMSW__ tests with __WINDOWS__ ones and modify bakefiles
to allow specifying the toolkit to be built in wxMSW makefiles.

Closes #13902.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73290 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-12-28 16:03:03 +00:00
parent 91270d2d17
commit d48f13a168
59 changed files with 114959 additions and 36027 deletions

View File

@@ -74,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
@@ -90,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 )
@@ -541,7 +555,6 @@
!defined(__DOS__) && \
!defined(__WXPM__) && \
!defined(__WXMOTIF__) && \
!defined(__WXGTK__) && \
!defined(__WXX11__)
# include "wx/msw/gccpriv.h"
#else