fixed internal compiler error

[wxWidgets.git] / include / wx / defs.h

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 9a97532c8074a8aaa88fff460ef415c38d2e5757..06da9d41aab181ea1789a2cfe0607108f95f2090 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -41,12 +41,12 @@
 #endif
 #endif
 
 #endif
 #endif
 

-// Eliminate double/float warnings
+// suppress some Visual C++ warnings

 #ifdef _MSC_VER
 #ifdef _MSC_VER

-# pragma warning(disable:4244)
+#   pragma warning(disable:4244)    // cobversion from double to float
+#   pragma warning(disable:4100)    // unreferenced formal parameter

 #endif
 
 #endif
 

-

 //////////////////////////////////////////////////////////////////////////////////
 // Currently Only MS-Windows/NT, XView and Motif are supported
 //
 //////////////////////////////////////////////////////////////////////////////////
 // Currently Only MS-Windows/NT, XView and Motif are supported
 //


@@ -57,6 +57,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 +71,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"