diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/xmenu.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/xmenu.c b/src/xmenu.c index c17e1e801b7..63b2bf95f91 100644 --- a/src/xmenu.c +++ b/src/xmenu.c | |||
| @@ -2483,7 +2483,7 @@ create_and_show_popup_menu (f, first_wv, x, y, for_click) | |||
| 2483 | if (FRAME_X_DISPLAY_INFO (f)->grabbed & (1 << i)) | 2483 | if (FRAME_X_DISPLAY_INFO (f)->grabbed & (1 << i)) |
| 2484 | break; | 2484 | break; |
| 2485 | } | 2485 | } |
| 2486 | 2486 | ||
| 2487 | /* Display the menu. */ | 2487 | /* Display the menu. */ |
| 2488 | gtk_widget_show_all (menu); | 2488 | gtk_widget_show_all (menu); |
| 2489 | gtk_menu_popup (GTK_MENU (menu), 0, 0, pos_func, &popup_x_y, i, 0); | 2489 | gtk_menu_popup (GTK_MENU (menu), 0, 0, pos_func, &popup_x_y, i, 0); |
| @@ -2601,7 +2601,7 @@ create_and_show_popup_menu (f, first_wv, x, y, for_click) | |||
| 2601 | /* Display the menu. */ | 2601 | /* Display the menu. */ |
| 2602 | lw_popup_menu (menu, (XEvent *) &dummy); | 2602 | lw_popup_menu (menu, (XEvent *) &dummy); |
| 2603 | popup_activated_flag = 1; | 2603 | popup_activated_flag = 1; |
| 2604 | 2604 | ||
| 2605 | { | 2605 | { |
| 2606 | int fact = 4 * sizeof (LWLIB_ID); | 2606 | int fact = 4 * sizeof (LWLIB_ID); |
| 2607 | int specpdl_count = SPECPDL_INDEX (); | 2607 | int specpdl_count = SPECPDL_INDEX (); |
| @@ -3225,7 +3225,7 @@ pop_down_menu (arg) | |||
| 3225 | { | 3225 | { |
| 3226 | struct Lisp_Save_Value *p1 = XSAVE_VALUE (Fcar (arg)); | 3226 | struct Lisp_Save_Value *p1 = XSAVE_VALUE (Fcar (arg)); |
| 3227 | struct Lisp_Save_Value *p2 = XSAVE_VALUE (Fcdr (arg)); | 3227 | struct Lisp_Save_Value *p2 = XSAVE_VALUE (Fcdr (arg)); |
| 3228 | 3228 | ||
| 3229 | FRAME_PTR f = p1->pointer; | 3229 | FRAME_PTR f = p1->pointer; |
| 3230 | XMenu *menu = p2->pointer; | 3230 | XMenu *menu = p2->pointer; |
| 3231 | 3231 | ||
| @@ -3459,7 +3459,7 @@ xmenu_show (f, x, y, for_click, keymaps, title, error) | |||
| 3459 | #ifndef MSDOS | 3459 | #ifndef MSDOS |
| 3460 | XMenuActivateSetWaitFunction (x_menu_wait_for_event, FRAME_X_DISPLAY (f)); | 3460 | XMenuActivateSetWaitFunction (x_menu_wait_for_event, FRAME_X_DISPLAY (f)); |
| 3461 | #endif | 3461 | #endif |
| 3462 | 3462 | ||
| 3463 | record_unwind_protect (pop_down_menu, | 3463 | record_unwind_protect (pop_down_menu, |
| 3464 | Fcons (make_save_value (f, 0), | 3464 | Fcons (make_save_value (f, 0), |
| 3465 | make_save_value (menu, 0))); | 3465 | make_save_value (menu, 0))); |