Added LV_ITEMA and used a #define for LV_ITEM to

avoid mysterious compilo under Mingw32 2.95.2
Added #defines for SHGetFileInfo for Mingw32 2.95.2
in volume.cpp

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

diff --git a/include/wx/msw/missing.h b/include/wx/msw/missing.h
index c29e85121e3ca99166b1d6e51032f65c60f6ae27..724369042068bc373b6eb63a85f42f1f2f89c5a7 100644 (file)
--- a/include/wx/msw/missing.h
+++ b/include/wx/msw/missing.h
@@ -100,7 +100,24 @@ typedef struct _LVITEMW {
     int iIndent;
 #endif
 } LV_ITEMW;
-typedef LV_ITEM LV_ITEMA;
+
+typedef struct tagLVITEMA
+{
+    UINT mask;
+    int iItem;
+    int iSubItem;
+    UINT state;
+    UINT stateMask;
+    LPSTR pszText;
+    int cchTextMax;
+    int iImage;
+    LPARAM lParam;
+#if (_WIN32_IE >= 0x0300)
+    int iIndent;
+#endif
+} LV_ITEMA;
+
+#define LV_ITEM LV_ITEMA;
 #endif
 
 #ifndef ListView_GetColumnWidth

diff --git a/src/msw/volume.cpp b/src/msw/volume.cpp
index bb81bbf9e9a6bcd41e925367880dccf8181971f1..e1b4db737d8169b32e8fa262314379f22deaac94 100644 (file)
--- a/src/msw/volume.cpp
+++ b/src/msw/volume.cpp
@@ -41,6 +41,16 @@
 
 #include "wx/volume.h"
 
+#include <shellapi.h>
+
+#ifndef SHGetFileInfo
+#ifdef UNICODE
+#define SHGetFileInfo SHGetFileInfoW
+#else
+#define SHGetFileInfo SHGetFileInfoA
+#endif
+#endif
+
 #ifndef SHGFI_ATTRIBUTES
     #define SHGFI_ATTRIBUTES 2048
 #endif