From a2d6341e4fc8fa34dfb0c5cbb295adc867220679 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 20 Aug 2015 12:24:16 +0200 Subject: [PATCH] Disable warnings in the standard gdiplus.h header with MSVC14. There is nothing we can do about these (harmless) warnings, so just disable them. Closes #17113. --- include/wx/msw/wrapgdip.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/wx/msw/wrapgdip.h b/include/wx/msw/wrapgdip.h index 04d4009a67..7b12ea51f9 100644 --- a/include/wx/msw/wrapgdip.h +++ b/include/wx/msw/wrapgdip.h @@ -24,8 +24,21 @@ #define min(a,b) (((a) < (b)) ? (a) : (b)) #endif +// There are many clashes between the names of the member fields and parameters +// in the standard gdiplus.h header and each of them results in C4458 with +// VC14, so disable this warning for this file as there is no other way to +// avoid it. +#ifdef __VISUALC__ + #pragma warning(push) + #pragma warning(disable:4458) // declaration of 'xxx' hides class member +#endif + #include using namespace Gdiplus; +#ifdef __VISUALC__ + #pragma warning(pop) +#endif + #endif // _WX_MSW_WRAPGDIP_H_