diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/msdos.h | 1 | ||||
| -rw-r--r-- | src/xmenu.c | 14 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/msdos.h b/src/msdos.h index 24697bcf24b..1b304cf02b9 100644 --- a/src/msdos.h +++ b/src/msdos.h @@ -123,7 +123,6 @@ extern void x_set_menu_bar_lines (struct frame *, Lisp_Object, Lisp_Object); #define XGetGeometry(p1,p2,p3,p4,p5,p6,p7,p8,p9) #define DisplayWidth(p1,p2) (SELECTED_FRAME()->text_cols) #define DisplayHeight(p1,p2) (SELECTED_FRAME()->text_lines) -#define XMenuSetAEQ (void) #define XMenuSetFreeze (void) #define XMenuRecompute (void) #define XM_FAILURE -1 diff --git a/src/xmenu.c b/src/xmenu.c index 9d35e3529fb..d9660a6910f 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -294,10 +294,13 @@ x_menu_translate_generic_event (XEvent *event) #endif #if !defined USE_X_TOOLKIT && !defined USE_GTK -static void -x_menu_expose_event (XEvent *event) +static int +x_menu_dispatch_event (XEvent *event) { x_dispatch_event (event, event->xexpose.display); + + /* The return doesn't really matter. */ + return 0; } #endif #endif /* ! MSDOS */ @@ -2747,21 +2750,22 @@ x_menu_show (struct frame *f, int x, int y, int menuflags, y += 1.5 * height/ (maxlines + 2); } - XMenuSetAEQ (menu, true); XMenuSetFreeze (menu, true); pane = selidx = 0; #ifndef MSDOS DEFER_SELECTIONS; - XMenuActivateSetWaitFunction (x_menu_wait_for_event, FRAME_X_DISPLAY (f)); + XMenuActivateSetWaitFunction (x_menu_wait_for_event, + FRAME_X_DISPLAY (f)); + XMenuEventHandler (x_menu_dispatch_event); + /* When the input extension is in use, the owner_events grab will report extension events on frames, which the XMenu library does not normally understand. */ #ifdef HAVE_XINPUT2 XMenuActivateSetTranslateFunction (x_menu_translate_generic_event); #endif - XMenuActivateSetExposeFunction (x_menu_expose_event); #endif record_unwind_protect_ptr (pop_down_menu, |