Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

do not define __WXMSW__ and __WXQT__ at the same time

Browse Source
This commit is contained in:
Cătălin Răceanu
2018-08-03 00:48:19 +03:00
parent 7ec3a14c9a
commit 5adc65d085
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/platform.h
View File

@@ -81,7 +81,7 @@
#if defined(__WINDOWS__) #if defined(__WINDOWS__)
/* Select wxMSW under Windows if no other port is specified. */ /* Select wxMSW under Windows if no other port is specified. */
# if !defined(__WXMSW__) && !defined(__WXMOTIF__) && !defined(__WXGTK__) && !defined(__WXX11__) # if !defined(__WXMSW__) && !defined(__WXMOTIF__) && !defined(__WXGTK__) && !defined(__WXX11__) && !defined(__WXQT__)
# define __WXMSW__ # define __WXMSW__
# endif # endif
@@ -122,13 +122,13 @@
# endif # endif
#endif #endif
#if defined(__WXGTK__) && defined(__WINDOWS__) #if (defined(__WXGTK__) || defined(__WXQT__)) && defined(__WINDOWS__)
# ifdef __WXMSW__ # ifdef __WXMSW__
# undef __WXMSW__ # undef __WXMSW__
# endif # endif
#endif /* __WXGTK__ && __WINDOWS__ */ #endif /* (__WXGTK__ || __WXQT__) && __WINDOWS__ */
#ifdef __ANDROID__ #ifdef __ANDROID__
# define __WXANDROID__ # define __WXANDROID__