Some code renaming to avoid confusion. Test editable column in sample.

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

diff --git a/include/wx/afterstd.h b/include/wx/afterstd.h
index c74886ae8225d6885ff12e34a0bb90805131aad6..6fdbb315b320f905f806798861cfadb800fbd7be 100644 (file)
--- a/include/wx/afterstd.h
+++ b/include/wx/afterstd.h
@@ -13,17 +13,29 @@
     See the comments in beforestd.h.
  */
 
     See the comments in beforestd.h.
  */
 

-#if defined(__WXMSW__) && defined(__MINGW32__)
+#if defined(__WXMSW__)

     #include "wx/msw/winundef.h"
 #endif
     #include "wx/msw/winundef.h"
 #endif

-#ifdef _MSC_VER
+
+// undo what we did in wx/beforestd.h
+#if defined(__VISUALC__) && __VISUALC__ <= 1201

     // MSVC 5 does not have this
     #if _MSC_VER > 1100
     // MSVC 5 does not have this
     #if _MSC_VER > 1100

+        // don't restore this one for VC6, it gives it in each try/catch which is a
+        // bit annoying to say the least
+        #if _MSC_VER >= 0x1300
+            // unreachable code
+            #pragma warning(default:4702)
+        #endif // VC++ >= 7
+

         #pragma warning(pop)
     #else
         // 'expression' : signed/unsigned mismatch
         #pragma warning(default:4018)
 
         #pragma warning(pop)
     #else
         // 'expression' : signed/unsigned mismatch
         #pragma warning(default:4018)
 

+        // 'identifier' : unreferenced formal parameter
+        #pragma warning(default:4100)
+

         // 'conversion' : conversion from 'type1' to 'type2',
         // possible loss of data
         #pragma warning(default:4244)
         // 'conversion' : conversion from 'type1' to 'type2',
         // possible loss of data
         #pragma warning(default:4244)