summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2014-10-20 10:27:01 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2014-10-20 10:27:01 (GMT)
commitbbd2c853245f2b25f75c023031ad1cceb14fd751 (patch)
tree3db57d9bdd2fa0beefa4b943deefc9ce25f10766
parent3a75326e43c5f04164e7b9747d8e8e1b081cbe01 (diff)
downloadtk-bbd2c853245f2b25f75c023031ad1cceb14fd751.zip
tk-bbd2c853245f2b25f75c023031ad1cceb14fd751.tar.gz
tk-bbd2c853245f2b25f75c023031ad1cceb14fd751.tar.bz2
Make sure IID_IShellItem is defined even when uuid.lib does not export it. Idea stolen from here: [http://trac.wxwidgets.org/changeset/71395]
-rw-r--r--win/tkWinDialog.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/win/tkWinDialog.c b/win/tkWinDialog.c
index fd5b809..b4c06fd 100644
--- a/win/tkWinDialog.c
+++ b/win/tkWinDialog.c
@@ -528,6 +528,13 @@ struct IFileOpenDialog
#endif /* __IFileDialog_INTERFACE_DEFINED__ */
+/* Define this GUID in any case, even when __IShellItem_INTERFACE_DEFINED__ is
+ * defined in the headers we might still not have it in the actual uuid.lib,
+ * this happens with at least VC7 used with its original (i.e. not updated) SDK
+ * and there is no harm in defining the GUID unconditionally. */
+DEFINE_GUID(IID_IShellItem,
+ 0x43826D1E, 0xE718, 0x42EE, 0xBC, 0x55, 0xA1, 0xE2, 0x61, 0xC3, 0x7B, 0xFE);
+
/*
* Definitions of functions used only in this file.
*/