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

fix custom draw bug for controls with only one column (patch 1731024)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46382 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-06-09 10:57:25 +00:00
parent fdb9d2b867
commit 0c1602b8ad
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/msw/listctrl.cpp
View File

@@ -2417,7 +2417,8 @@ static RECT GetCustomDrawnItemRect(const NMCUSTOMDRAW& nmcd)
return rc; return rc;
} }
static bool HandleSubItemPrepaint(LPNMLVCUSTOMDRAW pLVCD, HFONT hfont) static
bool HandleSubItemPrepaint(LPNMLVCUSTOMDRAW pLVCD, HFONT hfont, int colCount)
{ {
NMCUSTOMDRAW& nmcd = pLVCD->nmcd; NMCUSTOMDRAW& nmcd = pLVCD->nmcd;
@@ -2432,7 +2433,7 @@ static bool HandleSubItemPrepaint(LPNMLVCUSTOMDRAW pLVCD, HFONT hfont)
// get the rectangle to paint // get the rectangle to paint
RECT rc; RECT rc;
ListView_GetSubItemRect(hwndList, item, col, LVIR_BOUNDS, &rc); ListView_GetSubItemRect(hwndList, item, col, LVIR_BOUNDS, &rc);
if ( !col ) if ( !col && colCount > 1 )
{ {
// broken ListView_GetSubItemRect() returns the entire item rect for // broken ListView_GetSubItemRect() returns the entire item rect for
// 0th subitem while we really need just the part for this column // 0th subitem while we really need just the part for this column
@@ -2602,7 +2603,7 @@ static void HandleItemPaint(LPNMLVCUSTOMDRAW pLVCD, HFONT hfont)
for ( int col = 0; col < colCount; col++ ) for ( int col = 0; col < colCount; col++ )
{ {
pLVCD->iSubItem = col; pLVCD->iSubItem = col;
HandleSubItemPrepaint(pLVCD, hfont); HandleSubItemPrepaint(pLVCD, hfont, colCount);
} }
HandleItemPostpaint(nmcd); HandleItemPostpaint(nmcd);