Blind fix for daily builds

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

diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp
index 5726bf45a5eaeb96e5c22ad6eac307c925239298..b0f73cdf2f5f9d132b3ba5ee72ba3b7a5734fad6 100644 (file)
--- a/src/msw/listctrl.cpp
+++ b/src/msw/listctrl.cpp
@@ -117,6 +117,24 @@
     #define LVCFMT_BITMAP_ON_RIGHT 0x1000
 #endif
 
     #define LVCFMT_BITMAP_ON_RIGHT 0x1000
 #endif
 

+#if defined(__GNUWIN32__) && !defined(LV_ITEM) \
+    && !wxCHECK_W32API_VERSION( 0, 5 )
+typedef struct _LVITEMW {
+    UINT mask;
+    int iItem;
+    int iSubItem;
+    UINT state;
+    UINT stateMask;
+    LPWSTR pszText;
+    int cchTextMax;
+    int iImage;
+    LPARAM lParam;
+#if (_WIN32_IE >= 0x0300)
+    int iIndent;
+#endif
+} LV_ITEMW;
+#endif
+

 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------

diff --git a/src/msw/volume.cpp b/src/msw/volume.cpp
index 4812244e485cbffc6634b73c85f5da34e805d4e0..2c04d2952fba2d7e3e02dfca302781a07e2b5bda 100644 (file)
--- a/src/msw/volume.cpp
+++ b/src/msw/volume.cpp
@@ -44,6 +44,30 @@
 // Win32 headers
 #include <shlobj.h>
 
 // Win32 headers
 #include <shlobj.h>
 

+#ifndef SHGFI_ATTRIBUTES
+    #define SHGFI_ATTRIBUTES 2048
+#endif
+
+#ifndef SFGAO_READONLY
+    #define SFGAO_READONLY 0x00040000L
+#endif
+
+#ifndef SFGAO_REMOVABLE
+    #define SFGAO_REMOVABLE 0x02000000L
+#endif
+
+#ifndef SHGFI_DISPLAYNAME
+    #define SHGFI_DISPLAYNAME 512
+#endif
+
+#ifndef SHGFI_ICON
+    #define SHGFI_ICON 256
+#endif
+
+#ifndef SHGFI_SMALLICON
+     #define SHGFI_SMALLICON 1
+#endif
+

 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 // Dynamic library function defs.
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 // Dynamic library function defs.
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++


@@ -76,7 +100,9 @@ static FileInfoMap s_fileInfo(25);
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 // Other initialization.
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 // Other initialization.
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

+#if wxUSE_GUI

 WX_DEFINE_OBJARRAY(wxIconArray);
 WX_DEFINE_OBJARRAY(wxIconArray);

+#endif

 
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 // Local helper functions.
 
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 // Local helper functions.


@@ -477,7 +503,7 @@ bool wxFSVolume::Create(const wxString& name)
     }
     m_dispName = fi.szDisplayName;
 
     }
     m_dispName = fi.szDisplayName;
 

-#ifdef wxUSE_GUI
+#if wxUSE_GUI

 
     m_icons.Alloc(wxFS_VOL_ICO_MAX);
     int idx;
 
     m_icons.Alloc(wxFS_VOL_ICO_MAX);
     int idx;


@@ -535,7 +561,7 @@ int wxFSVolume::GetFlags() const
     return itr->second.m_flags;
 } // GetFlags
 
     return itr->second.m_flags;
 } // GetFlags
 

-#ifdef wxUSE_GUI
+#if wxUSE_GUI

 
 //=============================================================================
 // Function: GetIcon
 
 //=============================================================================
 // Function: GetIcon