X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d6f513f829d7060a7f4adada4e023b3f1ac3d29c..ab67e8874db324fab5223cc8d5dff8a8de3e2b77:/include/wx/afterstd.h?ds=sidebyside diff --git a/include/wx/afterstd.h b/include/wx/afterstd.h index d57412d7e2..890342c8a0 100644 --- 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: @@ -13,7 +13,7 @@ See the comments in beforestd.h. */ -#if defined(__WXMSW__) +#if defined(__WINDOWS__) #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 - // 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