Release 950109
Thu Jan 5 13:37:42 1995 Cameron Heide (heide@ee.ualberta.ca)
* [memory/global.c]
GlobalCompact should now return the correct value when the
largest run of free blocks includes the last block.
* [windows/mdi.c]
Tiling and cascading windows without any MDI children should
no longer crash (assuming no-op is the correct thing to do).
Sun Jan 1 23:30:25 1995 Fons Botman <botman@rabo.nl>
* [objects/font.c]
GetTextExtentPoint: fixed debug output, str is counted string, not
zero terminated.
* [if1632/relay.c]
DLLRelay: when debugging_stack got segv, added upper bound for
stack dump.
diff --git a/controls/menu.c b/controls/menu.c
index 3ac8946..0647eaf 100644
--- a/controls/menu.c
+++ b/controls/menu.c
@@ -1,9 +1,9 @@
/*
- * Menus functions
-static char RCSId[] = "$Id$";
-static char Copyright[] = "Copyright Martin Ayotte, 1993";
-static char Copyright2[] = "Copyright Alexandre Julliard, 1994";
-*/
+ * Menu functions
+ *
+ * Copyright 1993 Martin Ayotte
+ * Copyright 1994 Alexandre Julliard
+ */
/*
* Note: the style MF_MOUSESELECT is used to mark popup items that
@@ -18,7 +18,6 @@
#include "windows.h"
#include "syscolor.h"
#include "sysmetrics.h"
-#include "prototypes.h"
#include "menu.h"
#include "user.h"
#include "win.h"
@@ -482,15 +481,13 @@
GRAPH_DrawBitmap(hdc, lpitem->hCheckBit ? lpitem->hCheckBit :
hStdCheck, rect.left,
(rect.top+rect.bottom-check_bitmap_height) / 2,
- 0, 0, check_bitmap_width, check_bitmap_height,
- SRCCOPY);
+ 0, 0, check_bitmap_width, check_bitmap_height );
}
else if (lpitem->hUnCheckBit != 0) /* Not checked */
{
GRAPH_DrawBitmap(hdc, lpitem->hUnCheckBit, rect.left,
(rect.top+rect.bottom-check_bitmap_height) / 2,
- 0, 0, check_bitmap_width, check_bitmap_height,
- SRCCOPY);
+ 0, 0, check_bitmap_width, check_bitmap_height );
}
/* Draw the popup-menu arrow */
@@ -500,8 +497,7 @@
GRAPH_DrawBitmap( hdc, hStdMnArrow,
rect.right-arrow_bitmap_width-1,
(rect.top+rect.bottom-arrow_bitmap_height) / 2,
- 0, 0, arrow_bitmap_width, arrow_bitmap_height,
- SRCCOPY );
+ 0, 0, arrow_bitmap_width, arrow_bitmap_height );
}
rect.left += check_bitmap_width;
@@ -513,8 +509,7 @@
if (lpitem->item_flags & MF_BITMAP)
{
GRAPH_DrawBitmap( hdc, (HBITMAP)lpitem->hText, rect.left, rect.top,
- 0, 0, rect.right-rect.left, rect.bottom-rect.top,
- SRCCOPY );
+ 0, 0, rect.right-rect.left, rect.bottom-rect.top );
return;
}
/* No bitmap - process text if present */
@@ -1018,7 +1013,7 @@
{
POPUPMENU *menu;
MENUITEM *item;
- HMENU hsubmenu;
+ HMENU hsubmenu = 0;
WORD id;
if (!hmenu) return FALSE; /* Outside all menus */
