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

- Implement DFCS_TRANSPARENT.

Browse source 
- Fix indentation.
- Add remark about unimplemented DFC_POPUPMENU.
This commit is contained in:
Dimitrie O. Paun 2002-09-09 19:22:40 +00:00 committed by Alexandre Julliard
parent db6c9b0d8e
commit 8fce1a4c8e
1 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
controls/uitools.c
View file

@ -682,6 +682,7 @@ static BOOL UITOOLS95_DFC_ButtonPush(HDC dc, LPRECT r, UINT uFlags)
else
UITOOLS95_DrawRectEdge(dc, &myr, edge, (uFlags&DFCS_FLAT)|BF_RECT|BF_SOFT|BF_ADJUST);
if (!(uFlags & DFCS_TRANSPARENT))
UITOOLS_DrawCheckedRect( dc, &myr );
}
else
@ -689,11 +690,12 @@ static BOOL UITOOLS95_DFC_ButtonPush(HDC dc, LPRECT r, UINT uFlags)
if(uFlags & DFCS_MONO)
{
UITOOLS95_DrawRectEdge(dc, &myr, edge, BF_MONO|BF_RECT|BF_ADJUST);
if (!(uFlags & DFCS_TRANSPARENT))
FillRect(dc, &myr, GetSysColorBrush(COLOR_BTNFACE));
}
else
{
UITOOLS95_DrawRectEdge(dc, r, edge, (uFlags&DFCS_FLAT) | BF_MIDDLE | BF_RECT);
UITOOLS95_DrawRectEdge(dc, r, edge, (uFlags & DFCS_FLAT) | ((uFlags & DFCS_TRANSPARENT) ? 0 : BF_MIDDLE) | BF_RECT);
}
}
@ -724,6 +726,7 @@ static BOOL UITOOLS95_DFC_ButtonCheck(HDC dc, LPRECT r, UINT uFlags)
{
RECT myr, bar;
UINT flags = BF_RECT | BF_ADJUST;
UITOOLS_MakeSquareRect(r, &myr);
if(uFlags & DFCS_FLAT) flags |= BF_FLAT;
@ -731,12 +734,13 @@ static BOOL UITOOLS95_DFC_ButtonCheck(HDC dc, LPRECT r, UINT uFlags)
UITOOLS95_DrawRectEdge( dc, &myr, EDGE_SUNKEN, flags );
if (!(uFlags & DFCS_TRANSPARENT))
{
if(uFlags & (DFCS_INACTIVE | DFCS_PUSHED))
FillRect(dc, &myr, GetSysColorBrush(COLOR_BTNFACE));
else if( (uFlags & DFCS_BUTTON3STATE) && (uFlags & DFCS_CHECKED) )
UITOOLS_DrawCheckedRect( dc, &myr );
else
{
FillRect(dc, &myr, GetSysColorBrush(COLOR_WINDOW));
}
@ -783,9 +787,7 @@ static BOOL UITOOLS95_DFC_ButtonRadio(HDC dc, LPRECT r, UINT uFlags)
if(BorderShrink < 1) BorderShrink = 1;
if((uFlags & 0xff) == DFCS_BUTTONRADIOIMAGE)
{
FillRect(dc, r, (HBRUSH)GetStockObject(BLACK_BRUSH));
}
xc = myr.left + SmallDiam - SmallDiam/2;
yc = myr.top + SmallDiam - SmallDiam/2;
@ -1414,6 +1416,9 @@ BOOL WINAPI DrawFrameControl( HDC hdc, LPRECT rc, UINT uType,
return UITOOLS95_DrawFrameCaption(hdc, rc, uState);
case DFC_MENU:
return UITOOLS95_DrawFrameMenu(hdc, rc, uState);
/*case DFC_POPUPMENU:
FIXME("DFC_POPUPMENU: not implemented\n");
break;*/
case DFC_SCROLL:
return UITOOLS95_DrawFrameScroll(hdc, rc, uState);
default:
@ -1422,4 +1427,3 @@ BOOL WINAPI DrawFrameControl( HDC hdc, LPRECT rc, UINT uType,
}
return FALSE;
}