From 2e48a2cc22cad8ae02a83646d82675c73bb49206 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sun, 31 Oct 1999 17:36:26 +0000 Subject: [PATCH] Do not clear the drawing area for etched static controls. Replaced our own drawing stuff in etched static controls by DrawEdge. --- controls/static.c | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/controls/static.c b/controls/static.c index b198fbe1148..87a63452151 100644 --- a/controls/static.c +++ b/controls/static.c @@ -474,41 +474,19 @@ static void STATIC_PaintBitmapfn(WND *wndPtr, HDC hdc ) static void STATIC_PaintEtchedfn( WND *wndPtr, HDC hdc ) { RECT rc; - HBRUSH hbrush; - HPEN hpen; if (TWEAK_WineLook == WIN31_LOOK) return; GetClientRect( wndPtr->hwndSelf, &rc ); - hbrush = SendMessageA( GetParent(wndPtr->hwndSelf), WM_CTLCOLORSTATIC, - hdc, wndPtr->hwndSelf ); - FillRect( hdc, &rc, hbrush ); - switch (wndPtr->dwStyle & SS_TYPEMASK) { case SS_ETCHEDHORZ: - hpen = SelectObject (hdc, GetSysColorPen (COLOR_3DSHADOW)); - MoveToEx (hdc, rc.left, rc.bottom / 2 - 1, NULL); - LineTo (hdc, rc.right - 1, rc.bottom / 2 - 1); - SelectObject (hdc, GetSysColorPen (COLOR_3DHIGHLIGHT)); - MoveToEx (hdc, rc.left, rc.bottom / 2, NULL); - LineTo (hdc, rc.right, rc.bottom / 2); - LineTo (hdc, rc.right, rc.bottom / 2 - 1); - SelectObject (hdc, hpen); + DrawEdge(hdc,&rc,EDGE_ETCHED,BF_TOP|BF_BOTTOM); break; - case SS_ETCHEDVERT: - hpen = SelectObject (hdc, GetSysColorPen (COLOR_3DSHADOW)); - MoveToEx (hdc, rc.right / 2 - 1, rc.top, NULL); - LineTo (hdc, rc.right / 2 - 1, rc.bottom - 1); - SelectObject (hdc, GetSysColorPen (COLOR_3DHIGHLIGHT)); - MoveToEx (hdc, rc.right / 2, rc.top, NULL); - LineTo (hdc, rc.right / 2, rc.bottom); - LineTo (hdc, rc.right / 2 -1 , rc.bottom); - SelectObject (hdc, hpen); + DrawEdge(hdc,&rc,EDGE_ETCHED,BF_LEFT|BF_RIGHT); break; - case SS_ETCHEDFRAME: DrawEdge (hdc, &rc, EDGE_ETCHED, BF_RECT); break;