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

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   08/07/27 18:24:49

Index: src/termhooks.h
===================================================================
RCS file: /cvsroot/emacs/emacs/src/termhooks.h,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -b -r1.94 -r1.95
--- src/termhooks.h     15 Jul 2008 18:15:17 -0000      1.94
+++ src/termhooks.h     27 Jul 2008 18:24:47 -0000      1.95
@@ -105,7 +105,7 @@
   HORIZ_WHEEL_EVENT,            /* A wheel event generated by a second
                                    horizontal wheel that is present on some
                                    mice. See WHEEL_EVENT.  */
-#if defined (WINDOWSNT) || defined (MAC_OS)
+#if defined (WINDOWSNT)
   LANGUAGE_CHANGE_EVENT,       /* A LANGUAGE_CHANGE_EVENT is
                                   generated on WINDOWSNT or Mac OS
                                   when the keyboard layout or input
@@ -176,16 +176,6 @@
      save yourself before shutdown. */
   SAVE_SESSION_EVENT
 
-#ifdef MAC_OS
-  /* Generated when an Apple event, a HICommand event, or a Services
-     menu event is received and the corresponding handler is
-     registered.  Members `x' and `y' are for the event class and ID
-     symbols, respectively.  Member `arg' is a Lisp object converted
-     from the received Apple event.  Parameters for non-Apple events
-     are converted to those in Apple events.  */
-  , MAC_APPLE_EVENT
-#endif
-
 #ifdef HAVE_GPM
   , GPM_CLICK_EVENT
 #endif
@@ -317,7 +307,6 @@
 #endif /* CONSP */
 
 
-struct mac_display_info;
 struct ns_display_info;
 struct x_display_info;
 struct w32_display_info;
@@ -369,7 +358,6 @@
     struct tty_display_info *tty;     /* termchar.h */
     struct x_display_info *x;         /* xterm.h */
     struct w32_display_info *w32;     /* w32term.h */
-    struct mac_display_info *mac;     /* macterm.h */
     struct ns_display_info *ns;       /* nsterm.h */
   } display_info;
 
@@ -642,9 +630,6 @@
 #ifdef HAVE_NTGUI
 #define FRAME_WINDOW_P(f) FRAME_W32_P (f)
 #endif
-#ifdef MAC_OS
-#define FRAME_WINDOW_P(f) FRAME_MAC_P (f)
-#endif
 #ifndef FRAME_WINDOW_P
 #define FRAME_WINDOW_P(f) (0)
 #endif