]> git.eshelyaron.com Git - emacs.git/commit
Replace MenuHandle and GetMenuHandle with MenuRef and
authorYAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Sat, 29 Mar 2008 00:46:21 +0000 (00:46 +0000)
committerYAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Sat, 29 Mar 2008 00:46:21 +0000 (00:46 +0000)
commitc98e277397009b29c62874aeadd153e480182a78
tree2afece3030dc3a8375eab7f3f43c8cb426453306
parent693b73c4189a7c30f6dd62370b93d00d807d0f4c
Replace MenuHandle and GetMenuHandle with MenuRef and
GetMenuRef, respectively.  Replace WindowPtr with WindowRef.
Replace ControlHandle with ControlRef.
[!TARGET_API_MAC_CARBON]: Include Quickdraw.h instead of QuickDraw.h.
(install_menu_quit_handler): Rename arg MENU_HANDLE to ROOT_MENU.
[TARGET_API_MAC_CARBON] (menu_target_item_handler): Don't call next
handler.  Return immediately unless popup is activated.
[TARGET_API_MAC_CARBON] (install_menu_target_item_handler):
Remove argument.  Install handler to application.
(set_frame_menubar): Don't change deep_p.
(mac_menu_show): Use FRAME_OUTER_TO_INNER_DIFF_X and
FRAME_OUTER_TO_INNER_DIFF_Y.
(DIALOG_BUTTON_COMMAND_ID_OFFSET, DIALOG_BUTTON_COMMAND_ID_P)
(DIALOG_BUTTON_COMMAND_ID_VALUE, DIALOG_BUTTON_MAKE_COMMAND_ID)
[HAVE_DIALOGS]: New macros.
[HAVE_DIALOGS] (mac_handle_dialog_event, create_and_show_dialog):
Use them.
(fill_menu) [TARGET_API_MAC_CARBON]: Use SetMenuItemHierarchicalMenu.
(fill_menubar) [TARGET_API_MAC_CARBON]: Use CFString.
(mac_dialog_modal_filter, Fx_popup_dialog) [MAC_OSX]: Put special
treatment for Fmessage_box, Fyes_or_no_p, and Fy_or_n_p in #if 0
as it is not compatible with y-or-n-p-with-timeout.
(timer_check) [TARGET_API_MAC_CARBON]: Add extern.
[TARGET_API_MAC_CARBON] (mac_handle_dialog_event): Use QuitEventLoop
instead of QuitAppModalLoopForWindow.  Consolidate QuitEventLoop calls.
(pop_down_dialog) [TARGET_API_MAC_CARBON]: New function.
[TARGET_API_MAC_CARBON] (create_and_show_dialog): Use it for unwind.
Run timers during dialog popup.
(Fmenu_or_popup_active_p) [TARGET_API_MAC_CARBON]: Use popup_activated.
(quit_dialog_event_loop) [TARGET_API_MAC_CARBON]: New variable.
[TARGET_API_MAC_CARBON] (mac_handle_dialog_event): Set it if dialog
event loop should be quit.
[TARGET_API_MAC_CARBON] (create_and_show_dialog): Quit dialog event loop
if quit_dialog_event_loop is set.
src/macmenu.c