comparison src/menubar-msw.c @ 276:6330739388db r21-0b36

Import from CVS: tag r21-0b36
author cvs
date Mon, 13 Aug 2007 10:30:37 +0200
parents c5d627a313b1
children 90d73dddcdc4
comparison
equal deleted inserted replaced
275:a68ae4439f57 276:6330739388db
111 111
112 /* #### defines go to gui-msw.h, as the range is shared with toolbars 112 /* #### defines go to gui-msw.h, as the range is shared with toolbars
113 (If only toolbars will be implemented as common controls) */ 113 (If only toolbars will be implemented as common controls) */
114 #define MENU_ITEM_ID_MIN 0x8000 114 #define MENU_ITEM_ID_MIN 0x8000
115 #define MENU_ITEM_ID_MAX 0xFFFF 115 #define MENU_ITEM_ID_MAX 0xFFFF
116 #define MENU_ITEM_ID_BITS(x) ((x) & 0x7FFF | 0x8000) 116 #define MENU_ITEM_ID_BITS(x) (((x) & 0x7FFF) | 0x8000)
117 static HMENU top_level_menu; 117 static HMENU top_level_menu;
118 118
119 #define MAX_MENUITEM_LENGTH 128 119 #define MAX_MENUITEM_LENGTH 128
120 120
121 /* 121 /*
642 enqueue_misc_user_event (frame, funcsym, command); 642 enqueue_misc_user_event (frame, funcsym, command);
643 643
644 /* Needs good bump also, for WM_COMMAND may have been dispatched from 644 /* Needs good bump also, for WM_COMMAND may have been dispatched from
645 mswindows_need_event, which will block again despite new command 645 mswindows_need_event, which will block again despite new command
646 event has arrived */ 646 event has arrived */
647 mswindows_enqueue_magic_event (FRAME_MSWINDOWS_HANDLE(f), 647 mswindows_bump_queue ();
648 XM_BUMPQUEUE); 648
649
650 UNGCPRO; /* command */ 649 UNGCPRO; /* command */
651 return Qt; 650 return Qt;
652 } 651 }
653 652
654 653
687 if (GetMenu (FRAME_MSWINDOWS_HANDLE(f)) == hmenu) 686 if (GetMenu (FRAME_MSWINDOWS_HANDLE(f)) == hmenu)
688 { 687 {
689 wm_initmenu_frame = f; 688 wm_initmenu_frame = f;
690 return mswindows_protect_modal_loop (unsafe_handle_wm_initmenu, Qnil); 689 return mswindows_protect_modal_loop (unsafe_handle_wm_initmenu, Qnil);
691 } 690 }
692 return Qt;
693 }
694
695 /* #### This function goes away. Removing it now may
696 interfere with pending patch 980128-jhar */
697 Lisp_Object
698 mswindows_handle_wm_exitmenuloop (struct frame* f)
699 {
700 return Qt; 691 return Qt;
701 } 692 }
702 693
703 694
704 /*------------------------------------------------------------------------*/ 695 /*------------------------------------------------------------------------*/