From: Jérôme Gardou Date: Tue, 31 Aug 2010 16:49:09 +0000 (+0000) Subject: [USER32] X-Git-Tag: backups/reactos-yarotows@57446~23 X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=98006d55b681b758ff75b6d81d2b95582d466d99 [USER32] - Use GetSysColorBrush(...) instead of CreateSolidBrush(GetSysColor(...)) svn path=/branches/reactos-yarotows/; revision=48667 --- diff --git a/dll/win32/user32/windows/draw.c b/dll/win32/user32/windows/draw.c index c722dc7dbe8..dd50c75b1c3 100644 --- a/dll/win32/user32/windows/draw.c +++ b/dll/win32/user32/windows/draw.c @@ -1373,9 +1373,9 @@ IntDrawState(HDC hdc, HBRUSH hbr, DRAWSTATEPROC func, LPARAM lp, WPARAM wp, } if (flags & DSS_DISABLED) - hbrtmp = CreateSolidBrush(GetSysColor(COLOR_3DHILIGHT)); + hbrtmp = GetSysColorBrush(COLOR_3DHILIGHT); else if (flags & DSS_DEFAULT) - hbrtmp = CreateSolidBrush(GetSysColor(COLOR_3DSHADOW)); + hbrtmp = GetSysColorBrush(COLOR_3DSHADOW); /* Draw light or dark shadow */ if (flags & (DSS_DISABLED|DSS_DEFAULT)) @@ -1388,13 +1388,11 @@ IntDrawState(HDC hdc, HBRUSH hbr, DRAWSTATEPROC func, LPARAM lp, WPARAM wp, if(!BitBlt(hdc, x+1, y+1, cx, cy, memdc, 0, 0, 0x00B8074A)) goto cleanup; SelectObject(hdc, hbsave); - DeleteObject(hbrtmp); - hbrtmp = 0; } if (flags & DSS_DISABLED) { - hbr = hbrtmp = CreateSolidBrush(GetSysColor(COLOR_3DSHADOW)); + hbr = hbrtmp = GetSysColorBrush(COLOR_3DSHADOW); if(!hbrtmp) goto cleanup; } @@ -1418,8 +1416,6 @@ cleanup: SelectObject(hdc, hbsave); if(hbmsave) SelectObject(memdc, hbmsave); - if(hbrtmp) - DeleteObject(hbrtmp); if(hbm) DeleteObject(hbm); if(memdc)