X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d1279c9a3d065a48fabd465c3bf4678190ca5a3e..86ac84b8ce086e6bbda58f422d41f84268606e35:/include/wx/log.h?ds=sidebyside diff --git a/include/wx/log.h b/include/wx/log.h index a787afd3dd..88b6475240 100644 --- a/include/wx/log.h +++ b/include/wx/log.h @@ -705,6 +705,7 @@ public: // VC6 produces a warning if we a macro expanding to nothing to // DECLARE_LOG_FUNCTION2: #if defined(__VISUALC__) && __VISUALC__ < 1300 + #pragma warning(push) // "not enough actual parameters for macro 'DECLARE_LOG_FUNCTION2_EXP'" #pragma warning(disable:4003) #endif @@ -818,7 +819,7 @@ DECLARE_LOG_FUNCTION2(SysError, unsigned long, lErrCode); #endif // wxUSE_LOG_TRACE/!wxUSE_LOG_TRACE #if defined(__VISUALC__) && __VISUALC__ < 1300 - #pragma warning(default:4003) + #pragma warning(pop) #endif // wxLogFatalError helper: show the (fatal) error to the user in a safe way,