From 5a61ec1817b5ed0af07ea1ade6b4dd78a52dea9f Mon Sep 17 00:00:00 2001 From: YAMAMOTO Mitsuharu Date: Wed, 21 Dec 2005 12:31:22 +0000 Subject: [PATCH] (struct mac_output): Remove unused member menu_command_in_progress. --- src/ChangeLog | 31 +++++++++++++++++++++++++++++++ src/macterm.h | 3 --- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 969f9f6c46..e2a9a18850 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,34 @@ +2005-12-21 YAMAMOTO Mitsuharu + + * macmenu.c (Qmac_apple_event): Add extern. + (set_frame_menubar, mac_menu_show keymp_panes) + (single_keymap_panes, list_of_panes, list_of_item) + (single_menu_item): Add argument types to prototypes. + (mac_dialog_show) [HAVE_DIALOGS]: Likewise. + (struct skp): New struct (from xmenu.c). + (single_keymap_panes, single_menu_item, list_of_panes) + (list_of_item): Sync with xmenu.c. + (Fx_popup_menu, Fx_popup_dialog): Likewise. Don't get window from + POSITION if it is mac-apple-event event. + (menubar_selection_callback): Don't use menu_command_in_progress. + (set_frame_menubar): First parse all submenus, then make + widget_value trees from them. Don't allocate any widget_value + objects until we are done with the parsing. + (parse_single_submenu, digest_single_submenu): New functions. + (single_submenu): Function deleted, replaced by those two. + (install_menu_quit_handler) [HAVE_CANCELMENUTRACKING]: Don't + create or dispose of EventHandlerUPP. Install hander to all submenus. + (mac_menu_show) [!HAVE_MULTILINGUAL_MENU]: Use ENCODE_MENU_STRING + instead of ENCODE_SYSTEM. + (free_frame_menubar, fill_submenu, fill_menu): Don't use NULL for + integer values. + [HAVE_DIALOGS] (mac_dialog_show): Sync with xdialog_show (in xmenu.c). + (add_menu_item) [TARGET_API_MAC_CARBON]: Use CFString functions to + format menu item string. Don't use NULL for integer value. + + * macterm.h (struct mac_output): Remove unused member + menu_command_in_progress. + 2005-12-20 Juri Linkov * xmenu.c (Fx_popup_menu): Set Vmenu_updating_frame to f if diff --git a/src/macterm.h b/src/macterm.h index ae9c27eb76..fb9651312c 100644 --- a/src/macterm.h +++ b/src/macterm.h @@ -322,9 +322,6 @@ struct mac_output { /* Nonzero means menubar is currently active. */ char menubar_active; - /* Nonzero means a menu command is being processed. */ - char menu_command_in_progress; - /* Relief GCs, colors etc. */ struct relief { -- 2.39.2