From 244531bc9662a5930f0c785cbc9d1383f70b6232 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sat, 15 Sep 2001 10:39:22 +0000 Subject: [PATCH] compilation (hot)fixes for Mingw git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11607 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/listctrl.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp index fbf22fa5dd..1344f75e9b 100644 --- a/src/msw/listctrl.cpp +++ b/src/msw/listctrl.cpp @@ -101,6 +101,14 @@ #define HDM_GETITEMRECT (HDM_FIRST+7) #endif +#ifndef LVCF_IMAGE + #define LVCF_IMAGE 0x0010 +#endif + +#ifndef LVCFMT_BITMAP_ON_RIGHT + #define LVCFMT_BITMAP_ON_RIGHT 0x1000 +#endif + // ---------------------------------------------------------------------------- // private functions // ---------------------------------------------------------------------------- @@ -1767,10 +1775,13 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) wxStrncpy(lvi.pszText, text, lvi.cchTextMax); } +#if defined(_WIN32_IE) && _WIN32_IE >= 0x300 \ + && !( defined(__GNUWIN32__) && !wxCHECK_W32API_VERSION( 1, 0 ) ) if ( lvi.mask & LVIF_IMAGE ) { lvi.iImage = OnGetItemImage(item); } +#endif // a little dose of healthy paranoia: as we never use // LVM_SETCALLBACKMASK we're not supposed to get these ones @@ -2276,6 +2287,8 @@ static void wxConvertToMSWListCol(int col, const wxListItem& item, lvCol.cx = item.m_width; } +#if defined(_WIN32_IE) && _WIN32_IE >= 0x300 \ + && !( defined(__GNUWIN32__) && !wxCHECK_W32API_VERSION( 1, 0 ) ) if ( item.m_mask & wxLIST_MASK_IMAGE ) { if ( wxTheApp->GetComCtl32Version() >= 470 ) @@ -2285,6 +2298,7 @@ static void wxConvertToMSWListCol(int col, const wxListItem& item, } //else: it doesn't support item images anyhow } +#endif } // ---------------------------------------------------------------------------- -- 2.45.2