diff options
| author | Chong Yidong | 2010-07-16 11:42:15 -0400 |
|---|---|---|
| committer | Chong Yidong | 2010-07-16 11:42:15 -0400 |
| commit | fea9cabd275c3d5809b824a6e4a1446441a6793e (patch) | |
| tree | a5eb69edf85fe28f6b4d5bbc8e3c2c3cfc3d0d37 /src/xmenu.c | |
| parent | 7e4289ad2bbd9f8ed18902f652d3f07380b227bf (diff) | |
| parent | f253ef6a8e0dd71cf9fd58e3d9407549d30e091d (diff) | |
| download | emacs-fea9cabd275c3d5809b824a6e4a1446441a6793e.tar.gz emacs-fea9cabd275c3d5809b824a6e4a1446441a6793e.zip | |
Merge changes from emacs-23 branch.
Diffstat (limited to 'src/xmenu.c')
| -rw-r--r-- | src/xmenu.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/xmenu.c b/src/xmenu.c index 82b315f83cb..2fb39339b98 100644 --- a/src/xmenu.c +++ b/src/xmenu.c | |||
| @@ -664,14 +664,6 @@ x_activate_menubar (FRAME_PTR f) | |||
| 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 |