[Emacs-diffs] Changes to emacs/src/macterm.h,v

[YAMAMOTO Mitsuharu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     YAMAMOTO Mitsuharu <mituharu>   06/09/19 03:19:05

Index: macterm.h
===================================================================
RCS file: /cvsroot/emacs/emacs/src/macterm.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- macterm.h   27 Aug 2006 07:10:03 -0000      1.47
+++ macterm.h   19 Sep 2006 03:19:05 -0000      1.48
@@ -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