Disable warnings in the standard shlobj.h header with MSVC14
There is nothing we can do about these (harmless) warnings, so just
disable them. Also make sure that the header is included via
wx/msw/wrapshl.h everywhere.
(backported from commit e37f1a84ce
)
This commit is contained in:
@@ -20,8 +20,21 @@
|
||||
#include <shellapi.h>
|
||||
#endif
|
||||
|
||||
#ifdef __VISUALC__
|
||||
// Disable a warning that we can do nothing about: we get it for
|
||||
// shlobj.h at least from 7.1a Windows kit when using VC14.
|
||||
#pragma warning(push)
|
||||
|
||||
// 'typedef ': ignored on left of '' when no variable is declared
|
||||
#pragma warning(disable:4091)
|
||||
#endif
|
||||
|
||||
#include <shlobj.h>
|
||||
|
||||
#ifdef __VISUALC__
|
||||
#pragma warning(pop)
|
||||
#endif
|
||||
|
||||
#include "wx/msw/winundef.h"
|
||||
|
||||
#include "wx/log.h"
|
||||
|
@@ -100,7 +100,7 @@
|
||||
|
||||
#ifdef __WINDOWS__
|
||||
#include "wx/msw/private.h"
|
||||
#include <shlobj.h> // for CLSID_ShellLink
|
||||
#include "wx/msw/wrapshl.h" // for CLSID_ShellLink
|
||||
#include "wx/msw/missing.h"
|
||||
#include "wx/msw/ole/oleutils.h"
|
||||
#endif
|
||||
|
@@ -48,7 +48,7 @@
|
||||
#endif
|
||||
|
||||
#include <oleauto.h>
|
||||
#include <shlobj.h>
|
||||
#include "wx/msw/wrapshl.h"
|
||||
|
||||
#include "wx/msw/ole/oleutils.h"
|
||||
|
||||
|
@@ -39,7 +39,7 @@
|
||||
|
||||
#ifdef __WIN32__
|
||||
#if !defined(__GNUWIN32__) || wxUSE_NORLANDER_HEADERS
|
||||
#include <shlobj.h> // for DROPFILES structure
|
||||
#include "wx/msw/wrapshl.h" // for DROPFILES structure
|
||||
#endif
|
||||
#else
|
||||
#include <shellapi.h>
|
||||
|
@@ -44,7 +44,7 @@
|
||||
// even if this is not necessary with most of them
|
||||
#include "wx/msw/wrapwin.h"
|
||||
#include <shellapi.h>
|
||||
#include <shlobj.h>
|
||||
#include "wx/msw/wrapshl.h"
|
||||
#include "wx/msw/missing.h"
|
||||
|
||||
#if wxUSE_BASE
|
||||
|
Reference in New Issue
Block a user