From c0df13a6e3e1cf0d5bd2c3aac1be059b6ab2dd24 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sun, 8 Nov 2009 00:14:30 +0000 Subject: [PATCH] * xmenu.c (Fx_popup_menu): Hide any tooltip before opening a menu. --- src/ChangeLog | 4 ++-- src/xmenu.c | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index bc209cb284f..9fb03a341e0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,7 +1,7 @@ -2009-11-07 Chong Yidong +2009-11-08 Chong Yidong * xmenu.c (Fx_popup_menu): Extract event timestamp. Pass it to - xmenu_show. + xmenu_show. Hide any tooltip before opening a menu. (xmenu_show): New arg. Pass it to create_and_show_popup_menu. (create_and_show_popup_menu): New arg. Pass it to gtk_menu_popup. diff --git a/src/xmenu.c b/src/xmenu.c index 080930a4e78..d8493283440 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -502,6 +502,9 @@ no quit occurs and `x-popup-menu' returns nil. */) } #ifdef HAVE_MENUS + /* Hide a previous tip, if any. */ + Fx_hide_tip (); + /* Display them in a menu. */ BLOCK_INPUT; @@ -1805,6 +1808,7 @@ create_and_show_popup_menu (f, first_wv, x, y, for_click, timestamp) /* Display the menu. */ gtk_widget_show_all (menu); + gtk_menu_popup (GTK_MENU (menu), 0, 0, pos_func, &popup_x_y, i, timestamp > 0 ? timestamp : gtk_get_current_event_time()); -- 2.39.2