__WIN16__ not defined any more for !MSW build

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1023 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 9a97532c8074a8aaa88fff460ef415c38d2e5757..6d684c34d04d97853782ff3ca1cab027d45ae4ec 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -46,7 +46,6 @@
 # pragma warning(disable:4244)
 #endif
 
 # pragma warning(disable:4244)
 #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__
 #endif
 
 # define __X__
 #endif
 

+#ifdef __WXMSW__

 // wxWindows checks for WIN32, not __WIN32__
 #if ((defined(WIN32) || defined(__NT__)) && !defined(__WIN32__) && !defined(__WXSTUBS__))
 #define __WIN32__
 // wxWindows checks for WIN32, not __WIN32__
 #if ((defined(WIN32) || defined(__NT__)) && !defined(__WIN32__) && !defined(__WXSTUBS__))
 #define __WIN32__


@@ -70,6 +70,8 @@
 #define __WIN95__
 #endif
 
 #define __WIN95__
 #endif
 

+#endif // wxMSW
+

 // Make sure the environment is set correctly
 #if defined(__WXMSW__) && defined(__X__)
 # error "Target can't be both X and Windows"
 // Make sure the environment is set correctly
 #if defined(__WXMSW__) && defined(__X__)
 # error "Target can't be both X and Windows"