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.
This commit is contained in:
Václav Slavík
2016-03-23 14:41:33 +01:00
parent 4793e5b0a4
commit e37f1a84ce
6 changed files with 18 additions and 5 deletions

View File

@@ -13,8 +13,21 @@
#include "wx/msw/wrapwin.h" #include "wx/msw/wrapwin.h"
#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> #include <shlobj.h>
#ifdef __VISUALC__
#pragma warning(pop)
#endif
#include "wx/msw/winundef.h" #include "wx/msw/winundef.h"
#include "wx/log.h" #include "wx/log.h"

View File

@@ -100,7 +100,7 @@
#ifdef __WINDOWS__ #ifdef __WINDOWS__
#include "wx/msw/private.h" #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/missing.h"
#include "wx/msw/ole/oleutils.h" #include "wx/msw/ole/oleutils.h"
#include "wx/msw/private/comptr.h" #include "wx/msw/private/comptr.h"

View File

@@ -40,7 +40,7 @@
#include "wx/msw/registry.h" #include "wx/msw/registry.h"
#include "wx/msw/private.h" #include "wx/msw/private.h"
#include <shlwapi.h> #include <shlwapi.h>
#include <shlobj.h> #include "wx/msw/wrapshl.h"
// For MSVC we can link in the required library explicitly, for the other // For MSVC we can link in the required library explicitly, for the other
// compilers (e.g. MinGW) this needs to be done at makefiles level. // compilers (e.g. MinGW) this needs to be done at makefiles level.

View File

@@ -39,7 +39,7 @@
#include "wx/msw/private.h" // includes <windows.h> #include "wx/msw/private.h" // includes <windows.h>
#include <oleauto.h> #include <oleauto.h>
#include <shlobj.h> #include "wx/msw/wrapshl.h"
#include "wx/msw/ole/oleutils.h" #include "wx/msw/ole/oleutils.h"

View File

@@ -32,7 +32,7 @@
#include "wx/msw/private.h" #include "wx/msw/private.h"
#include <shlobj.h> // for DROPFILES structure #include "wx/msw/wrapshl.h" // for DROPFILES structure
#include "wx/dnd.h" #include "wx/dnd.h"

View File

@@ -44,7 +44,7 @@
// even if this is not necessary with most of them // even if this is not necessary with most of them
#include "wx/msw/wrapwin.h" #include "wx/msw/wrapwin.h"
#include <shellapi.h> #include <shellapi.h>
#include <shlobj.h> #include "wx/msw/wrapshl.h"
#include "wx/msw/missing.h" #include "wx/msw/missing.h"
#if wxUSE_BASE #if wxUSE_BASE