From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 2 May 2010 12:19:14 +0000 (+0000)
Subject: Include <windows.h> before including <shellapi.h>.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/8ba51e7326e1536fd2e544e70374cb997bdba2e6?ds=inline

Include <windows.h> before including <shellapi.h>.

Although this is not needed with most compilers (including recent MinGW),
including <shellapi.h> directly apparently doesn't work with some older MinGW
versions.

This fixes compilation after the changes of r64139.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64201 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/msw/volume.cpp b/src/msw/volume.cpp
index 35c487da01..36bf5d08cd 100644
--- a/src/msw/volume.cpp
+++ b/src/msw/volume.cpp
@@ -40,6 +40,9 @@
 #include "wx/dynlib.h"
 #include "wx/arrimpl.cpp"
 
+// some compilers require including <windows.h> before <shellapi.h> so do it
+// even if this is not necessary with most of them
+#include "wx/msw/wrapwin.h"
 #include <shellapi.h>
 #include <shlobj.h>
 #include "wx/msw/missing.h"