mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-22 18:35:09 +00:00
Code Issues Releases Activity

* gtkutil.c (menu_nav_ended): Check that menubar_widget is not NULL.

Browse Source
This commit is contained in:
Jan Djärv 2006-06-02 08:49:25 +00:00
parent 62e51d5356
commit 8b2b00f51c
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ChangeLog
View File

@ -1,3 +1,7 @@
2006-06-02 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* gtkutil.c (menu_nav_ended): Check that menubar_widget is not NULL.
2006-06-01 Richard Stallman <rms@gnu.org>
* window.c (Fsplit_window): Doc fix.

14
src/gtkutil.c
View File

@ -1981,16 +1981,20 @@ menu_nav_ended (wmenu, data)
gpointer data;
{
FRAME_PTR f = (FRAME_PTR) data;
Display *dpy = FRAME_X_DISPLAY (f);
BLOCK_INPUT;
if (FRAME_X_OUTPUT (f)->menubar_widget)
{
GtkMenuShell *w = GTK_MENU_SHELL (FRAME_X_OUTPUT (f)->menubar_widget);
Display *dpy = FRAME_X_DISPLAY (f);
BLOCK_INPUT;
gtk_menu_shell_deactivate (w);
gtk_menu_shell_deselect (w);
XUngrabKeyboard (dpy, CurrentTime);
XUngrabPointer (dpy, CurrentTime);
UNBLOCK_INPUT;
XUngrabKeyboard (dpy, CurrentTime);
XUngrabPointer (dpy, CurrentTime);
UNBLOCK_INPUT;
}
}