Reverted broken close button change.

windows/nonclient.c

@@ -933,9 +933,10 @@ void NC_DrawSysButton( HWND32 hwnd, HDC32 hdc, BOOL32 down )
     {
       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 @@ void NC_DrawCloseButton95 (HWND32 hwnd, HDC32 hdc, BOOL32 down)
 	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);