Allow wxAutomationObject::GetInstance() create new instance if needed.

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

diff --git a/include/wx/afterstd.h b/include/wx/afterstd.h
index a840f06f813b1a4e8e29beadf69e16cf5d2ad2c6..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,10 +13,33 @@
     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
-#   pragma warning(pop)
+
+// 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)
+    #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)
+
+        // C++ language change: to explicitly specialize class template
+        // 'identifier' use the following syntax
+        #pragma warning(default:4663)
+    #endif

 #endif
 
 #endif
 

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