Set wxTextCtrl::m_verRichEdit to 4 for RichEdit 4.1.

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

diff --git a/include/wx/afterstd.h b/include/wx/afterstd.h
index ecb2c3c88e4e4ed36ef2cc1617b2e4adb623223f..107d594eff6ab7fa979b8f2ac4cbe4aebd629567 100644 (file)
--- a/include/wx/afterstd.h
+++ b/include/wx/afterstd.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        include/wx/afterstd.h
+// Name:        wx/afterstd.h

 // Purpose:     #include after STL headers
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     #include after STL headers
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -13,11 +13,12 @@
     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

-// VC 7.x isn't as bad as VC6 and doesn't give these warnings
-#if defined(__VISUALC__) && __VISUALC__ <= 1200
+
+// undo what we did in wx/beforestd.h
+#if defined(__VISUALC__) && __VISUALC__ <= 1201

     // MSVC 5 does not have this
     #if _MSC_VER > 1100
         #pragma warning(pop)
     // MSVC 5 does not have this
     #if _MSC_VER > 1100
         #pragma warning(pop)


@@ -25,6 +26,9 @@
         // 'expression' : signed/unsigned mismatch
         #pragma warning(default:4018)
 
         // '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)


@@ -35,3 +39,7 @@
     #endif
 #endif
 
     #endif
 #endif
 

+// see beforestd.h for explanation
+#if defined(HAVE_VISIBILITY) && defined(HAVE_BROKEN_LIBSTDCXX_VISIBILITY)
+    #pragma GCC visibility pop
+#endif