Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

using ListView_Get[Sub]ItemRect() provokes warnings with mingw32 4.3, use our own versions

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55378 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-08-30 16:53:18 +00:00
parent ee56d68c45
commit 89cafab0f4
1 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/msw/listctrl.cpp
View File

@@ -82,6 +82,31 @@ static void wxConvertToMSWListCol(HWND hwndList,
const wxListItem& item, const wxListItem& item,
LV_COLUMN& lvCol); LV_COLUMN& lvCol);
namespace
{
// replacement for ListView_GetSubItemRect() which provokes warnings like
// "the address of 'rc' will always evaluate as 'true'" when used with mingw32
// 4.3+
//
// this function does no error checking on item and subitem parameters, notice
// that subitem is 0 for whole item or 1-based for the individual columns
inline bool
wxGetListCtrlSubItemRect(HWND hwnd, int item, int subitem, int flags, RECT& rect)
{
rect.top = subitem;
rect.left = flags;
return ::SendMessage(hwnd, LVM_GETSUBITEMRECT, item, (LPARAM)&rect) != 0;
}
inline bool
wxGetListCtrlItemRect(HWND hwnd, int item, int flags, RECT& rect)
{
return wxGetListCtrlSubItemRect(hwnd, item, 0, flags, rect);
}
} // anonymous namespace
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// private helper classes // private helper classes
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -1162,13 +1187,13 @@ bool wxListCtrl::GetSubItemRect(long item, long subItem, wxRect& rect, int code)
} }
RECT rectWin; RECT rectWin;
if ( !ListView_GetSubItemRect if ( !wxGetListCtrlSubItemRect
( (
GetHwnd(), GetHwnd(),
item, item,
subItem == wxLIST_GETSUBITEMRECT_WHOLEITEM ? 0 : subItem, subItem == wxLIST_GETSUBITEMRECT_WHOLEITEM ? 0 : subItem,
codeWin, codeWin,
&rectWin rectWin
) ) ) )
{ {
return false; return false;
@@ -2551,10 +2576,10 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
static RECT GetCustomDrawnItemRect(const NMCUSTOMDRAW& nmcd) static RECT GetCustomDrawnItemRect(const NMCUSTOMDRAW& nmcd)
{ {
RECT rc; RECT rc;
ListView_GetItemRect(nmcd.hdr.hwndFrom, nmcd.dwItemSpec, &rc, LVIR_BOUNDS); wxGetListCtrlItemRect(nmcd.hdr.hwndFrom, nmcd.dwItemSpec, LVIR_BOUNDS, rc);
RECT rcIcon; RECT rcIcon;
ListView_GetItemRect(nmcd.hdr.hwndFrom, nmcd.dwItemSpec, &rcIcon, LVIR_ICON); wxGetListCtrlItemRect(nmcd.hdr.hwndFrom, nmcd.dwItemSpec, LVIR_ICON, rcIcon);
// exclude the icon part, neither the selection background nor focus rect // exclude the icon part, neither the selection background nor focus rect
// should cover it // should cover it
@@ -2577,22 +2602,10 @@ bool HandleSubItemPrepaint(LPNMLVCUSTOMDRAW pLVCD, HFONT hfont, int colCount)
SelectInHDC selFont(hdc, hfont); SelectInHDC selFont(hdc, hfont);
// get the rectangle to paint // get the rectangle to paint
int subitem = colCount ? col + 1 : col;
RECT rc; RECT rc;
ListView_GetSubItemRect(hwndList, item, col, LVIR_BOUNDS, &rc); wxGetListCtrlSubItemRect(hwndList, item, subitem, LVIR_BOUNDS, rc);
if ( !col && colCount > 1 ) rc.left += 6;
{
// broken ListView_GetSubItemRect() returns the entire item rect for
// 0th subitem while we really need just the part for this column
RECT rc2;
ListView_GetSubItemRect(hwndList, item, 1, LVIR_BOUNDS, &rc2);
rc.right = rc2.left;
rc.left += 4;
}
else // not first subitem
{
rc.left += 6;
}
// get the image and text to draw // get the image and text to draw
wxChar text[512]; wxChar text[512];