Mercurial > emacs
changeset 72986:37ec6edfcc15
(struct mac_output): Remove member menubar_active.
(do_menu_choice): Remove extern.
(do_apple_menu) [!TARGET_API_MAC_CARBON]: Add extern.
| author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> |
|---|---|
| date | Tue, 19 Sep 2006 03:19:05 +0000 |
| parents | 45b141d01846 |
| children | b08f901b1d03 |
| files | src/macterm.h |
| diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/macterm.h Tue Sep 19 03:18:46 2006 +0000 +++ b/src/macterm.h Tue Sep 19 03:19:05 2006 +0000 @@ -226,7 +226,8 @@ }; /* 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 @@ /* 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_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