From: Jan Djärv Date: Fri, 12 Nov 2004 09:36:55 +0000 (+0000) Subject: (popup_widget_loop): Add argument do_timers. X-Git-Tag: ttn-vms-21-2-B4~3978 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=df00f4364c61cb4d813a158d6f7d4f31e1ea4adf;p=emacs.git (popup_widget_loop): Add argument do_timers. (create_and_show_popup_menu, create_and_show_dialog): Pass 1 for do_timers to popup_widget_loop. (create_and_show_popup_menu): Pass 1 for do_timers to popup_get_selection. --- diff --git a/src/ChangeLog b/src/ChangeLog index 7f66e82bfc6..b680abe8d4f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -3,8 +3,13 @@ * xmenu.c (x_menu_wait_for_event): New function. (popup_get_selection, popup_widget_loop): Call x_menu_wait_for_event to handle timers. + (popup_widget_loop): Add argument do_timers. + (create_and_show_popup_menu, create_and_show_dialog): Pass 1 for + do_timers to popup_widget_loop. (xmenu_show): Call XMenuActivateSetWaitFunction so that x_menu_wait_for_event is called by XMenuActivate. + (create_and_show_popup_menu): Pass 1 for do_timers to + popup_get_selection. 2004-11-10 Stefan Monnier diff --git a/src/xmenu.c b/src/xmenu.c index 9b9de8aa16d..d8ab2eb58aa 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -2456,7 +2456,7 @@ create_and_show_popup_menu (f, first_wv, x, y, for_click) two. show_help_echo uses this to detect popup menus. */ popup_activated_flag = 1; /* Process events that apply to the menu. */ - popup_widget_loop (0); + popup_widget_loop (1); gtk_widget_destroy (menu); @@ -2544,7 +2544,7 @@ create_and_show_popup_menu (f, first_wv, x, y, for_click) popup_activated_flag = 1; /* Process events that apply to the menu. */ - popup_get_selection ((XEvent *) 0, FRAME_X_DISPLAY_INFO (f), menu_id, 0, 0); + popup_get_selection ((XEvent *) 0, FRAME_X_DISPLAY_INFO (f), menu_id, 1, 0); /* fp turned off the following statement and wrote a comment that it is unnecessary--that the menu has already disappeared.