Mercurial > emacs
changeset 58169:611113427737
(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.
| author | Jan Djärv <jan.h.d@swipnet.se> |
|---|---|
| date | Fri, 12 Nov 2004 09:36:55 +0000 |
| parents | ab22e6ae6fac |
| children | 66ace4a9a250 |
| files | src/ChangeLog src/xmenu.c |
| diffstat | 2 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Nov 12 08:33:51 2004 +0000 +++ b/src/ChangeLog Fri Nov 12 09:36:55 2004 +0000 @@ -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 <monnier@iro.umontreal.ca>
--- a/src/xmenu.c Fri Nov 12 08:33:51 2004 +0000 +++ b/src/xmenu.c Fri Nov 12 09:36:55 2004 +0000 @@ -2456,7 +2456,7 @@ 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 @@ 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.