diff options
Diffstat (limited to 'src/keyboard.c')
| -rw-r--r-- | src/keyboard.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index dff8f6b2fc9..ea13c7f5bcd 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -3890,10 +3890,12 @@ kbd_buffer_get_event (KBOARD **kbp, #ifdef HAVE_EXT_MENU_BAR case MENU_BAR_ACTIVATE_EVENT: { + struct frame *f; kbd_fetch_ptr = next_kbd_event (event); input_pending = readable_events (0); - if (FRAME_LIVE_P (XFRAME (event->ie.frame_or_window))) - x_activate_menubar (XFRAME (event->ie.frame_or_window)); + f = (XFRAME (event->ie.frame_or_window)); + if (FRAME_LIVE_P (f) && FRAME_TERMINAL (f)->activate_menubar_hook) + FRAME_TERMINAL (f)->activate_menubar_hook (f); } break; #endif @@ -6508,7 +6510,7 @@ modify_event_symbol (ptrdiff_t symbol_num, int modifiers, Lisp_Object symbol_kin #ifdef HAVE_WINDOW_SYSTEM if (NILP (value)) { - char *name = x_get_keysym_name (symbol_num); + char *name = get_keysym_name (symbol_num); if (name) value = intern (name); } |