system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-31 10:13:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use DrawFocusRect to draw the focus rectangle.

Browse source
This commit is contained in:
Francois Gouget 2000-11-07 20:26:51 +00:00 committed by Alexandre Julliard
parent 365e7479f2
commit a2882e03f8
1 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
dlls/comctl32/tab.c
View file

@ -1594,10 +1594,7 @@ static void TAB_DrawItem(
HPEN hbPen = GetSysColorPen (COLOR_3DDKSHADOW);
HPEN hShade = GetSysColorPen (COLOR_BTNSHADOW);
HPEN hfocusPen = CreatePen(PS_ALTERNATE, 1, GetSysColor(COLOR_BTNTEXT));
HPEN holdPen;
INT oldBkMode;
BOOL deleteBrush = TRUE;
if (lStyle & TCS_BUTTONS)
@ -1657,7 +1654,7 @@ static void TAB_DrawItem(
/*
* Draw the tab now.
* The rectangles calculated exclude the right and bottom
* borders of the rectangle. To simply the following code, those
* borders of the rectangle. To simplify the following code, those
* borders are shaved-off beforehand.
*/
r.right--;
@ -1729,7 +1726,7 @@ static void TAB_DrawItem(
/*
* Draw the tab now.
* The rectangles calculated exclude the right and bottom
* borders of the rectangle. To simply the following code, those
* borders of the rectangle. To simplify the following code, those
* borders are shaved-off beforehand.
*/
r.right--;
@ -1824,8 +1821,6 @@ static void TAB_DrawItem(
}
}
oldBkMode = SetBkMode(hdc, TRANSPARENT);
/* This modifies r to be the text rectangle. */
TAB_DrawItemInterior(hwnd, hdc, iItem, &r);
@ -1834,20 +1829,14 @@ static void TAB_DrawItem(
(GetFocus() == hwnd) &&
(iItem == infoPtr->uFocus) )
{
HBRUSH hOldBrush;
r = itemRect;
InflateRect(&r, -1, -1);
hOldBrush = SelectObject(hdc, GetStockObject(NULL_BRUSH));
SelectObject(hdc, hfocusPen);
Rectangle(hdc, r.left, r.top, r.right, r.bottom);
SelectObject(hdc, hOldBrush);
DrawFocusRect(hdc, &r);
}
/* Cleanup */
SetBkMode(hdc, oldBkMode);
SelectObject(hdc, holdPen);
DeleteObject(hfocusPen);
if (deleteBrush) DeleteObject(hbr);
}
}