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

__WIN16__ not defined any more for !MSW build

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1023 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1998-11-23 12:41:10 +00:00
parent 593d4b0dff
commit 16ee7f42e1
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/defs.h
View File

@@ -46,7 +46,6 @@
# pragma warning(disable:4244) # pragma warning(disable:4244)
#endif #endif
////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////
// Currently Only MS-Windows/NT, XView and Motif are supported // Currently Only MS-Windows/NT, XView and Motif are supported
// //
@@ -57,6 +56,7 @@
# define __X__ # define __X__
#endif #endif
#ifdef __WXMSW__
// wxWindows checks for WIN32, not __WIN32__ // wxWindows checks for WIN32, not __WIN32__
#if ((defined(WIN32) || defined(__NT__)) && !defined(__WIN32__) && !defined(__WXSTUBS__)) #if ((defined(WIN32) || defined(__NT__)) && !defined(__WIN32__) && !defined(__WXSTUBS__))
#define __WIN32__ #define __WIN32__
@@ -70,6 +70,8 @@
#define __WIN95__ #define __WIN95__
#endif #endif
#endif // wxMSW
// Make sure the environment is set correctly // Make sure the environment is set correctly
#if defined(__WXMSW__) && defined(__X__) #if defined(__WXMSW__) && defined(__X__)
# error "Target can't be both X and Windows" # error "Target can't be both X and Windows"