diff options
author | Jan Djärv <jan.h.d@swipnet.se> | 2005-03-24 18:53:43 +0000 |
---|---|---|
committer | Jan Djärv <jan.h.d@swipnet.se> | 2005-03-24 18:53:43 +0000 |
commit | ff18668fa0cdc0c5cfb694c824ef0aa7cf1193cc (patch) | |
tree | 989ed3e67bc724140469a8ff740d6952ec7c02f2 /src/xmenu.c | |
parent | 04c769c2bd274857c665df68db6e0b173f09e110 (diff) | |
download | emacs-ff18668fa0cdc0c5cfb694c824ef0aa7cf1193cc.tar.gz |
* xmenu.c (create_and_show_popup_menu): Just remove menu and return
if it failed to pop up (Gnome "show pointer on ctrl" option makes
menus fail to pop up).
Diffstat (limited to 'src/xmenu.c')
-rw-r--r-- | src/xmenu.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/xmenu.c b/src/xmenu.c index 0cb0b73b71d..c17e1e801b7 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -2490,11 +2490,14 @@ create_and_show_popup_menu (f, first_wv, x, y, for_click) record_unwind_protect (pop_down_menu, make_save_value (menu, 0)); - /* Set this to one. popup_widget_loop increases it by one, so it becomes - two. show_help_echo uses this to detect popup menus. */ - popup_activated_flag = 1; - /* Process events that apply to the menu. */ - popup_widget_loop (1, menu); + if (GTK_WIDGET_MAPPED (menu)) + { + /* Set this to one. popup_widget_loop increases it by one, so it becomes + two. show_help_echo uses this to detect popup menus. */ + popup_activated_flag = 1; + /* Process events that apply to the menu. */ + popup_widget_loop (1, menu); + } unbind_to (specpdl_count, Qnil); |