diff src/event-stream.c @ 219:262b8bb4a523 r20-4b8

Import from CVS: tag r20-4b8
author cvs
date Mon, 13 Aug 2007 10:09:35 +0200
parents 78f53ef88e17
children 6c0ae1f9357f
line wrap: on
line diff
--- a/src/event-stream.c	Mon Aug 13 10:08:36 2007 +0200
+++ b/src/event-stream.c	Mon Aug 13 10:09:35 2007 +0200
@@ -3009,7 +3009,7 @@
   return event_binding (event0, 1);
 }
 
-#if defined(HAVE_X_WINDOWS) && defined(HAVE_MENUBARS)
+#if defined(HAVE_X_WINDOWS) && defined(HAVE_MENUBARS_LUCID)
 static void
 menu_move_up (void)
 {
@@ -3634,7 +3634,7 @@
     }
 
   /* if we're currently in a menu accelerator, check there for further events */
-#if defined(HAVE_X_WINDOWS) && defined(HAVE_MENUBARS)
+#if defined(HAVE_X_WINDOWS) && defined(HAVE_MENUBARS_LUCID)
   if (lw_menu_active)
     {
       return command_builder_operate_menu_accelerator (builder);
@@ -3647,7 +3647,7 @@
       if (NILP (result))
 #endif
 	result = command_builder_find_leaf_1 (builder);
-#if defined(HAVE_X_WINDOWS) && defined(HAVE_MENUBARS)
+#if defined(HAVE_X_WINDOWS) && defined(HAVE_MENUBARS_LUCID)
       if (NILP (result)
 	  && EQ (Vmenu_accelerator_enabled, Qmenu_fallback))
 	result = command_builder_find_menu_accelerator (builder);
@@ -4853,7 +4853,7 @@
   DEFSUBR (Fthis_command_keys);
   DEFSUBR (Freset_this_command_lengths);
   DEFSUBR (Fopen_dribble_file);
-#if defined(HAVE_X_WINDOWS) && defined(HAVE_MENUBARS)
+#if defined(HAVE_X_WINDOWS) && defined(HAVE_MENUBARS_LUCID)
   DEFSUBR (Faccelerate_menu);
 #endif