wxGTK/Cygwin fix (patch 914565)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28455 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
77a806722a
commit
d5cd19b45c
@ -84,7 +84,8 @@
|
|||||||
# endif /* !__WIN64__ */
|
# endif /* !__WIN64__ */
|
||||||
#endif /* _WIN64 */
|
#endif /* _WIN64 */
|
||||||
|
|
||||||
#if defined(_WIN32) || defined(WIN32) || defined(__NT__) || defined(__WXWINCE__)
|
#if (defined(_WIN32) || defined(WIN32) || defined(__NT__) || defined(__WXWINCE__)) \
|
||||||
|
&& !defined(__WXMOTIF__) && !defined(__WXGTK__) && !defined(__WXX11__)
|
||||||
# ifndef __WXMSW__
|
# ifndef __WXMSW__
|
||||||
# define __WXMSW__
|
# define __WXMSW__
|
||||||
# endif
|
# endif
|
||||||
@ -422,7 +423,7 @@
|
|||||||
#if ( defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || \
|
#if ( defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || \
|
||||||
defined( __CYGWIN__ ) || \
|
defined( __CYGWIN__ ) || \
|
||||||
(defined(__WATCOMC__) && __WATCOMC__ >= 1200) ) && \
|
(defined(__WATCOMC__) && __WATCOMC__ >= 1200) ) && \
|
||||||
!defined(__DOS__)
|
!defined(__DOS__) && !defined(__WXMOTIF__) && !defined(__WXGTK__) && !defined(__WXX11__)
|
||||||
# include "wx/msw/gccpriv.h"
|
# include "wx/msw/gccpriv.h"
|
||||||
#else
|
#else
|
||||||
# undef wxCHECK_W32API_VERSION
|
# undef wxCHECK_W32API_VERSION
|
||||||
|
Loading…
Reference in New Issue
Block a user