Force wide char environment version initialization in wxGetEnvMap().

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

diff --git a/include/wx/afterstd.h b/include/wx/afterstd.h
index 6fdbb315b320f905f806798861cfadb800fbd7be..890342c8a093414ea4e46796cf81d98399e6ae3b 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,7 +13,7 @@
     See the comments in beforestd.h.
  */
 
     See the comments in beforestd.h.
  */
 

-#if defined(__WXMSW__)
+#if defined(__WINDOWS__)

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


@@ -21,13 +21,6 @@
 #if defined(__VISUALC__) && __VISUALC__ <= 1201
     // MSVC 5 does not have this
     #if _MSC_VER > 1100
 #if defined(__VISUALC__) && __VISUALC__ <= 1201
     // 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(pop)
     #else
         // 'expression' : signed/unsigned mismatch


@@ -46,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