bug fixes for using wxTransientPopupWindow and wxDP_ALLOWNONE support from Andreas...

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

diff --git a/include/wx/beforestd.h b/include/wx/beforestd.h
index ee02dca9451014ec92015573ff61dc2f5fdaa59e..4c79e2660e5fa54d20f14cedceb3391d9f34a3d8 100644 (file)
--- a/include/wx/beforestd.h
+++ b/include/wx/beforestd.h
@@ -24,18 +24,25 @@
 #if defined(__VISUALC__) && __VISUALC__ <= 1200
     // MSVC 5 does not have this
     #if __VISUALC__ > 1100
+        // we have to disable (and reenable in afterstd.h) this one because,
+        // even though it is of level 4, it is not disabled by warning(push, 1)
+        // below for VC7.1!
+
+        // unreachable code
+        #pragma warning(disable:4702)
+
         #pragma warning(push, 1)
     #else // VC 5
-        // 'expression' : signed/unsigned mismatch 
-        #pragma warning(disable:4018) 
+        // 'expression' : signed/unsigned mismatch
+        #pragma warning(disable:4018)
 
-        // 'conversion' : conversion from 'type1' to 'type2', 
-        // possible loss of data 
-        #pragma warning(disable:4244) 
+        // 'conversion' : conversion from 'type1' to 'type2',
+        // possible loss of data
+        #pragma warning(disable:4244)
 
-        // C++ language change: to explicitly specialize class template 
-        // 'identifier' use the following syntax 
-        #pragma warning(disable:4663) 
+        // C++ language change: to explicitly specialize class template
+        // 'identifier' use the following syntax
+        #pragma warning(disable:4663)
     #endif
 
     // these warning have to be disabled and not just temporarily disabled