[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/src ChangeLog xmenu.c
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] emacs/src ChangeLog xmenu.c |
Date: |
Sun, 08 Nov 2009 00:14:32 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Chong Yidong <cyd> 09/11/08 00:14:31
Modified files:
src : ChangeLog xmenu.c
Log message:
* xmenu.c (Fx_popup_menu): Hide any tooltip before opening a menu.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7846&r2=1.7847
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xmenu.c?cvsroot=emacs&r1=1.345&r2=1.346
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7846
retrieving revision 1.7847
diff -u -b -r1.7846 -r1.7847
--- ChangeLog 7 Nov 2009 23:49:08 -0000 1.7846
+++ ChangeLog 8 Nov 2009 00:14:30 -0000 1.7847
@@ -1,7 +1,7 @@
-2009-11-07 Chong Yidong <address@hidden>
+2009-11-08 Chong Yidong <address@hidden>
* 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.
Index: xmenu.c
===================================================================
RCS file: /sources/emacs/emacs/src/xmenu.c,v
retrieving revision 1.345
retrieving revision 1.346
diff -u -b -r1.345 -r1.346
--- xmenu.c 7 Nov 2009 23:53:54 -0000 1.345
+++ xmenu.c 8 Nov 2009 00:14:31 -0000 1.346
@@ -502,6 +502,9 @@
}
#ifdef HAVE_MENUS
+ /* Hide a previous tip, if any. */
+ Fx_hide_tip ();
+
/* Display them in a menu. */
BLOCK_INPUT;
@@ -1805,6 +1808,7 @@
/* 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());