Mercurial > emacs
comparison src/menu.c @ 96759:1e2f7aab70ba
* Makefile.in: Undef LIB_STANDARD before defining it to silence warning
in case it was defined already.
USE @GNUSTEP_MAKEFILES@ rather than envvars.
* nsterm.m (ns_term_init): Pass Qt and Qnil rather than YES/NO to
ns_default.
(applicationShouldTerminate, setValuesFromPanel): Use EQ to compare
Lisp_Objects.
* nsterm.h (Fx_display_grayscale_p, Fx_display_planes)
(ns_defined_color, ns_color_to_lisp): Declare.
* nsselect.m (ns_handle_selection_request, ns_handle_selection_clear)
(Fns_own_selection_internal): Make the big ugly hack more explicit, so
it's accepted even with USE_LISP_UNION_TYPE.
* nsmenu.m (ns_update_menubar): Use EQ to compare Lisp_Objects.
(update_frame_tool_bar): Remove apparently obsolete tests for
non-integerness of f->tool_bar_lines.
(windowShouldClose, addButton, clicked, runDialogAt): Make the big ugly
hack more explicit, so it's accepted even with USE_LISP_UNION_TYPE.
* nsfont.m (nsfont_driver): Use just 0 rather than an invalid cast.
(nsfont_open): Don't confuse NULL for Qnil.
* nsfns.m (ns_implicitly_set_icon_type): Use EQ to compare Lisp_Objects.
* menu.h (find_and_call_menu_selection):
* menu.c (find_and_call_menu_selection): Use just int for vector size.
(find_and_return_menu_selection): Always return something.
* frame.h: Include dispextern.h for Display_Info.
(display_x_get_resource): Declare.
* configure.in: Extract and substitute GNUSTEP_MAKEFILES.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Thu, 17 Jul 2008 03:33:59 +0000 |
parents | d45acf0c8d23 |
children | 248808aeee3e |
comparison
equal
deleted
inserted
replaced
96758:4962b860277b | 96759:1e2f7aab70ba |
---|---|
879 VECTOR is an array of menu events for the whole menu. */ | 879 VECTOR is an array of menu events for the whole menu. */ |
880 | 880 |
881 void | 881 void |
882 find_and_call_menu_selection (f, menu_bar_items_used, vector, client_data) | 882 find_and_call_menu_selection (f, menu_bar_items_used, vector, client_data) |
883 FRAME_PTR f; | 883 FRAME_PTR f; |
884 EMACS_INT menu_bar_items_used; | 884 int menu_bar_items_used; |
885 Lisp_Object vector; | 885 Lisp_Object vector; |
886 void *client_data; | 886 void *client_data; |
887 { | 887 { |
888 Lisp_Object prefix, entry; | 888 Lisp_Object prefix, entry; |
889 Lisp_Object *subprefix_stack; | 889 Lisp_Object *subprefix_stack; |
1021 return entry; | 1021 return entry; |
1022 } | 1022 } |
1023 i += MENU_ITEMS_ITEM_LENGTH; | 1023 i += MENU_ITEMS_ITEM_LENGTH; |
1024 } | 1024 } |
1025 } | 1025 } |
1026 return Qnil; | |
1026 } | 1027 } |
1027 #endif | 1028 #endif |
1028 | 1029 |
1029 void | 1030 void |
1030 syms_of_menu () | 1031 syms_of_menu () |