commit cc2d3826f105c81bc6ee5fc8fd43de54548dedeb
author Alexandre Julliard <julliard@winehq.org> Thu Jan 03 02:35:23 2002 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu Jan 03 02:35:23 2002 +0000
tree 8a18a0cb02fc1c4c0b66196ef3229f9302a99574
parent 6ea7932c804da7e065226f8953e569bbfac5abbd

Use DrawFrameControl instead of bitmaps in certain cases.
Moved remaining OEM bitmaps to user32 resources.

windows/mdi.c

diff --git a/windows/mdi.c b/windows/mdi.c
index ba54a2b..cb11a5f 100644
--- a/windows/mdi.c
+++ b/windows/mdi.c
@@ -117,7 +117,6 @@
 } MDICLIENTINFO;
 
 static HBITMAP hBmpClose   = 0;
-static HBITMAP hBmpRestore = 0;
 
 /* ----------------- declarations ----------------- */
 static void MDI_UpdateFrameText( HWND, HWND, BOOL, LPCWSTR);
@@ -816,7 +815,7 @@
 {
  HDC 		hDCSrc  = CreateCompatibleDC(0);
  HDC		hDCDest	= CreateCompatibleDC(hDCSrc);
- HBITMAP	hbClose = LoadBitmapW(0, MAKEINTRESOURCEW(OBM_CLOSE) );
+ HBITMAP	hbClose = LoadBitmapW(0, MAKEINTRESOURCEW(OBM_OLD_CLOSE) );
  HBITMAP	hbCopy;
  HBITMAP	hobjSrc, hobjDest;
 
@@ -1243,11 +1242,7 @@
 	ci->mdiFlags		= 0;
         SetWindowLongW( hwnd, GWL_STYLE, GetWindowLongW(hwnd,GWL_STYLE) | WS_CLIPCHILDREN );
 
-	if (!hBmpClose)
-        {
-            hBmpClose = CreateMDIMenuBitmap();
-            hBmpRestore = LoadBitmapW( 0, MAKEINTRESOURCEW(OBM_RESTORE) );
-        }
+	if (!hBmpClose) hBmpClose = CreateMDIMenuBitmap();
 
 	if (ci->hWindowMenu != 0)
 	    AppendMenuW( ci->hWindowMenu, MF_SEPARATOR, 0, NULL );