Mercurial > emacs
diff src/keyboard.c @ 49322:2cbb0b823e83
GTK version
| author | Jan Dj?rv <jan.h.d@swipnet.se> |
|---|---|
| date | Sun, 19 Jan 2003 21:50:03 +0000 |
| parents | 1dd9faae71ac |
| children | 7e6cf4411cd4 |
line wrap: on
line diff
--- a/src/keyboard.c Sun Jan 19 20:03:42 2003 +0000 +++ b/src/keyboard.c Sun Jan 19 21:50:03 2003 +0000 @@ -3878,7 +3878,8 @@ XSETBUFFER (obj, current_buffer); kbd_fetch_ptr = event + 1; } -#if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) || defined (MAC_OS) +#if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) || defined (MAC_OS) \ + || defined (USE_GTK) else if (event->kind == MENU_BAR_ACTIVATE_EVENT) { kbd_fetch_ptr = event + 1; @@ -3985,7 +3986,8 @@ { obj = make_lispy_event (event); -#if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) || defined(MAC_OS) +#if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) || defined(MAC_OS) \ + || defined (USE_GTK) /* If this was a menu selection, then set the flag to inhibit writing to last_nonmenu_event. Don't do this if the event we're returning is (menu-bar), though; that indicates the @@ -5048,7 +5050,7 @@ pixel_to_glyph_coords (f, XINT (event->x), XINT (event->y), &column, &row, NULL, 1); -#ifndef USE_X_TOOLKIT +#if ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK) /* In the non-toolkit version, clicks on the menu bar are ordinary button events in the event buffer. Distinguish them, and invoke the menu. @@ -5100,7 +5102,7 @@ return Fcons (item, Fcons (position, Qnil)); } -#endif /* not USE_X_TOOLKIT */ +#endif /* not USE_X_TOOLKIT && not USE_GTK */ /* Set `window' to the window under frame pixel coordinates event->x/event->y. */ @@ -5589,7 +5591,8 @@ } #endif /* HAVE_MOUSE */ -#if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) || defined (MAC_OS) +#if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) || defined (MAC_OS) \ + || defined (USE_GTK) case MENU_BAR_EVENT: if (EQ (event->arg, event->frame_or_window)) /* This is the prefix key. We translate this to
