commit f0a0e126f340aa99440f8659e0e1464d520e672d
author Alexandre Julliard <julliard@winehq.org> Fri Feb 19 16:02:32 1999 +0000
committer Alexandre Julliard <julliard@winehq.org> Fri Feb 19 16:02:32 1999 +0000
tree acff32b630f14f87abd973ec17a1ea42fc3dd612
parent c3e1f72bac09b50cd4a0cbb421503617b6f677a3

Reverted broken close button change.

windows/nonclient.c

diff --git a/windows/nonclient.c b/windows/nonclient.c
index 3884adc..89f7af5 100644
--- a/windows/nonclient.c
+++ b/windows/nonclient.c
@@ -933,9 +933,10 @@
     {
       NC_GetInsideRect( hwnd, &rect );
       hdcMem = CreateCompatibleDC32( hdc );
-      hbitmap = SelectObject32( hdcMem, (down ? hbitmapCloseD : hbitmapClose));
+      hbitmap = SelectObject32( hdcMem, hbitmapClose );
       BitBlt32(hdc, rect.left, rect.top, SYSMETRICS_CXSIZE, SYSMETRICS_CYSIZE,
-               hdcMem, (wndPtr->dwStyle & WS_CHILD) ? SYSMETRICS_CXSIZE : 0, 0, SRCCOPY );
+               hdcMem, (wndPtr->dwStyle & WS_CHILD) ? SYSMETRICS_CXSIZE : 0, 0,
+               down ? NOTSRCCOPY : SRCCOPY );
       SelectObject32( hdcMem, hbitmap );
       DeleteDC32( hdcMem );
     }
@@ -1069,7 +1070,7 @@
 	GetObject32A (hBmp, sizeof(BITMAP32), &bmp);
 	BitBlt32 (hdc, rect.right - (sysMetrics[SM_CYCAPTION] + 1 + bmp.bmWidth) / 2,
 		  rect.top + (sysMetrics[SM_CYCAPTION] - 1 - bmp.bmHeight) / 2,
-		  bmp.bmWidth, bmp.bmHeight, hdcMem, 0, 0,  SRCCOPY);
+		  bmp.bmWidth, bmp.bmHeight, hdcMem, 0, 0, down ? NOTSRCCOPY : SRCCOPY);
 
 	SelectObject32 (hdcMem, hOldBmp);
 	DeleteDC32 (hdcMem);