summaryrefslogtreecommitdiff
path: root/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@novell.com>2011-07-20 22:26:55 +0300
committerTor Lillqvist <tlillqvist@novell.com>2011-07-20 22:27:00 +0300
commit104587b4ee67fca94123650022d1cbab9b298002 (patch)
treedfc9ca8a5efadae97736832a9f1e07c10310a9ae /fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
parent5e89ebcafdca40d8766dcd8b2768476aa3e4f15f (diff)
MinGW fixes
Unfortunately IFileDialog is missing from both mingw-w64 and Wine headers, so we can't build the specialized file picker for Vista or newer with MinGW. That sucks. Also fix some file name case and backslash botches in #include statements.
Diffstat (limited to 'fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx')
-rw-r--r--fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx9
1 files changed, 7 insertions, 2 deletions
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
index 85eed3ca39e0..d86755fa5a9a 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
@@ -37,6 +37,11 @@
#pragma warning( disable : 4917 )
#endif
+#include <shobjidl.h>
+
+// Without IFileDialog we can't do this
+#ifdef __IFileDialog_INTERFACE_DEFINED__
+
#include "comptr.hxx"
#include "vistatypes.h"
#include "IVistaFilePickerInternalNotify.hxx"
@@ -48,8 +53,6 @@
#include <cppuhelper/interfacecontainer.h>
#include <osl/interlck.h>
-#include <shobjidl.h>
-
//-----------------------------------------------------------------------------
// namespace
//-----------------------------------------------------------------------------
@@ -223,6 +226,8 @@ class VistaFilePickerEventHandler : public ::cppu::BaseMutex
#undef css
+#endif // __IFileDialog_INTERFACE_DEFINED__
+
#endif // FPICKER_WIN32_VISTA_FILEPICKER_EVENTHANDLER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */