From 0d3f16e5fe3185a9ff5425123857b31d51ee3a41 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Mitsuharu Date: Tue, 19 Sep 2006 03:19:05 +0000 Subject: [PATCH] (struct mac_output): Remove member menubar_active. (do_menu_choice): Remove extern. (do_apple_menu) [!TARGET_API_MAC_CARBON]: Add extern. --- src/macterm.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/macterm.h b/src/macterm.h index 945dbf3af57..edd89163e13 100644 --- a/src/macterm.h +++ b/src/macterm.h @@ -226,7 +226,8 @@ struct x_output }; /* The collection of data describing a window on the Mac. */ -struct mac_output { +struct mac_output +{ /* Placeholder for things accessed through output_data.x. Must appear first. */ struct x_output x_compatible; @@ -316,9 +317,6 @@ struct mac_output { /* Nonzero means tried already to make this frame visible. */ char asked_for_visible; - /* Nonzero means menubar is currently active. */ - char menubar_active; - /* Relief GCs, colors etc. */ struct relief { @@ -629,8 +627,10 @@ extern OSStatus mac_show_hide_font_panel P_ ((void)); extern OSStatus mac_set_font_info_for_selection P_ ((struct frame *, int, int)); extern OSStatus install_window_handler P_ ((WindowPtr)); extern void remove_window_handler P_ ((WindowPtr)); -extern void do_menu_choice P_ ((SInt32)); extern OSStatus mac_post_mouse_moved_event P_ ((void)); +#if !TARGET_API_MAC_CARBON +extern void do_apple_menu P_ ((SInt16)); +#endif #if USE_CG_DRAWING extern void mac_prepare_for_quickdraw P_ ((struct frame *)); #endif -- 2.39.2