comparison 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
comparison
equal deleted inserted replaced
218:c9f226976f56 219:262b8bb4a523
3007 return Qnil; 3007 return Qnil;
3008 3008
3009 return event_binding (event0, 1); 3009 return event_binding (event0, 1);
3010 } 3010 }
3011 3011
3012 #if defined(HAVE_X_WINDOWS) && defined(HAVE_MENUBARS) 3012 #if defined(HAVE_X_WINDOWS) && defined(HAVE_MENUBARS_LUCID)
3013 static void 3013 static void
3014 menu_move_up (void) 3014 menu_move_up (void)
3015 { 3015 {
3016 widget_value *current, *prev; 3016 widget_value *current, *prev;
3017 widget_value *entries; 3017 widget_value *entries;
3632 else 3632 else
3633 return Qnil; 3633 return Qnil;
3634 } 3634 }
3635 3635
3636 /* if we're currently in a menu accelerator, check there for further events */ 3636 /* if we're currently in a menu accelerator, check there for further events */
3637 #if defined(HAVE_X_WINDOWS) && defined(HAVE_MENUBARS) 3637 #if defined(HAVE_X_WINDOWS) && defined(HAVE_MENUBARS_LUCID)
3638 if (lw_menu_active) 3638 if (lw_menu_active)
3639 { 3639 {
3640 return command_builder_operate_menu_accelerator (builder); 3640 return command_builder_operate_menu_accelerator (builder);
3641 } 3641 }
3642 else 3642 else
3645 if (EQ (Vmenu_accelerator_enabled, Qmenu_force)) 3645 if (EQ (Vmenu_accelerator_enabled, Qmenu_force))
3646 result = command_builder_find_menu_accelerator (builder); 3646 result = command_builder_find_menu_accelerator (builder);
3647 if (NILP (result)) 3647 if (NILP (result))
3648 #endif 3648 #endif
3649 result = command_builder_find_leaf_1 (builder); 3649 result = command_builder_find_leaf_1 (builder);
3650 #if defined(HAVE_X_WINDOWS) && defined(HAVE_MENUBARS) 3650 #if defined(HAVE_X_WINDOWS) && defined(HAVE_MENUBARS_LUCID)
3651 if (NILP (result) 3651 if (NILP (result)
3652 && EQ (Vmenu_accelerator_enabled, Qmenu_fallback)) 3652 && EQ (Vmenu_accelerator_enabled, Qmenu_fallback))
3653 result = command_builder_find_menu_accelerator (builder); 3653 result = command_builder_find_menu_accelerator (builder);
3654 } 3654 }
3655 #endif 3655 #endif
4851 DEFSUBR (Fdispatch_event); 4851 DEFSUBR (Fdispatch_event);
4852 DEFSUBR (Fread_key_sequence); 4852 DEFSUBR (Fread_key_sequence);
4853 DEFSUBR (Fthis_command_keys); 4853 DEFSUBR (Fthis_command_keys);
4854 DEFSUBR (Freset_this_command_lengths); 4854 DEFSUBR (Freset_this_command_lengths);
4855 DEFSUBR (Fopen_dribble_file); 4855 DEFSUBR (Fopen_dribble_file);
4856 #if defined(HAVE_X_WINDOWS) && defined(HAVE_MENUBARS) 4856 #if defined(HAVE_X_WINDOWS) && defined(HAVE_MENUBARS_LUCID)
4857 DEFSUBR (Faccelerate_menu); 4857 DEFSUBR (Faccelerate_menu);
4858 #endif 4858 #endif
4859 4859
4860 defsymbol (&Qpre_command_hook, "pre-command-hook"); 4860 defsymbol (&Qpre_command_hook, "pre-command-hook");
4861 defsymbol (&Qpost_command_hook, "post-command-hook"); 4861 defsymbol (&Qpost_command_hook, "post-command-hook");