From: Julian Smart Date: Sun, 8 Sep 2002 10:28:15 +0000 (+0000) Subject: Added LV_ITEMA and used a #define for LV_ITEM to X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/eaeeb91eb6196d413b69ee28201cebb4f8384e53?ds=inline 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 c29e85121e..7243690420 100644 --- 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 bb81bbf9e9..e1b4db737d 100644 --- a/src/msw/volume.cpp +++ b/src/msw/volume.cpp @@ -41,6 +41,16 @@ #include "wx/volume.h" +#include + +#ifndef SHGetFileInfo +#ifdef UNICODE +#define SHGetFileInfo SHGetFileInfoW +#else +#define SHGetFileInfo SHGetFileInfoA +#endif +#endif + #ifndef SHGFI_ATTRIBUTES #define SHGFI_ATTRIBUTES 2048 #endif