Mercurial > emacs
comparison src/xmenu.c @ 109445:051595eb9b58
Merge changes from emacs-23 branch.
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Fri, 16 Jul 2010 11:42:15 -0400 |
parents | 6c14b478b70f 60266cf487b0 |
children | 0a2fae39b2dc |
comparison
equal
deleted
inserted
replaced
109443:9e514d1076b4 | 109445:051595eb9b58 |
---|---|
662 | 662 |
663 set_frame_menubar (f, 0, 1); | 663 set_frame_menubar (f, 0, 1); |
664 BLOCK_INPUT; | 664 BLOCK_INPUT; |
665 popup_activated_flag = 1; | 665 popup_activated_flag = 1; |
666 #ifdef USE_GTK | 666 #ifdef USE_GTK |
667 /* If we click outside any menu item, the menu bar still grabs. | |
668 So we send Press and the Release. If outside, grab is released. | |
669 If on a menu item, it is popped up normally. | |
670 PutBack is like a stack, so we put back in reverse order. */ | |
671 f->output_data.x->saved_menu_event->type = ButtonRelease; | |
672 XPutBackEvent (f->output_data.x->display_info->display, | |
673 f->output_data.x->saved_menu_event); | |
674 f->output_data.x->saved_menu_event->type = ButtonPress; | |
675 XPutBackEvent (f->output_data.x->display_info->display, | 667 XPutBackEvent (f->output_data.x->display_info->display, |
676 f->output_data.x->saved_menu_event); | 668 f->output_data.x->saved_menu_event); |
677 #else | 669 #else |
678 XtDispatchEvent (f->output_data.x->saved_menu_event); | 670 XtDispatchEvent (f->output_data.x->saved_menu_event); |
679 #endif | 671 #endif |