--- a/src/menubar-msw.c	Mon Aug 13 10:29:43 2007 +0200
+++ b/src/menubar-msw.c	Mon Aug 13 10:30:37 2007 +0200
@@ -113,7 +113,7 @@
    (If only toolbars will be implemented as common controls) */
 #define MENU_ITEM_ID_MIN 0x8000
 #define MENU_ITEM_ID_MAX 0xFFFF
-#define MENU_ITEM_ID_BITS(x) ((x) & 0x7FFF | 0x8000)
+#define MENU_ITEM_ID_BITS(x) (((x) & 0x7FFF) | 0x8000)
 static HMENU top_level_menu;
 
 #define MAX_MENUITEM_LENGTH 128
@@ -644,9 +644,8 @@
   /* Needs good bump also, for WM_COMMAND may have been dispatched from
      mswindows_need_event, which will block again despite new command
      event has arrived */
-  mswindows_enqueue_magic_event (FRAME_MSWINDOWS_HANDLE(f),
-				 XM_BUMPQUEUE);
-  
+  mswindows_bump_queue ();
+
   UNGCPRO; /* command */
   return Qt;
 }
@@ -692,14 +691,6 @@
   return Qt;
 }
 
-/* #### This function goes away. Removing it now may
-   interfere with pending patch 980128-jhar */
-Lisp_Object
-mswindows_handle_wm_exitmenuloop (struct frame* f)
-{
-  return Qt;
-}
-
 
 /*------------------------------------------------------------------------*/
 /* Methods                                                                */