[Emacs-diffs] Changes to emacs/src/macgui.h [emacs-unicode-2]

[Miles Bader]

Index: emacs/src/macgui.h
diff -c emacs/src/macgui.h:1.7.4.1 emacs/src/macgui.h:1.7.4.2
*** emacs/src/macgui.h:1.7.4.1  Fri Apr 16 12:50:48 2004
--- emacs/src/macgui.h  Mon Jun 28 07:29:22 2004
***************
*** 57,72 ****
  #undef init_process
  #define init_process emacs_init_process
  #undef INFINITY
- typedef struct OpaqueWindowPtr* Window;
  #else
  #include <QuickDraw.h>                /* for WindowPtr */
  #include <QDOffscreen.h>      /* for GWorldPtr */
  #include <Controls.h>         /* for ControlHandle in xdisp.c */
! typedef WindowPtr Window;
  #endif
  
  typedef GWorldPtr Pixmap;
  
  #define FACE_DEFAULT (~0)
  
  
--- 57,83 ----
  #undef init_process
  #define init_process emacs_init_process
  #undef INFINITY
  #else
  #include <QuickDraw.h>                /* for WindowPtr */
  #include <QDOffscreen.h>      /* for GWorldPtr */
  #include <Controls.h>         /* for ControlHandle in xdisp.c */
! #include <Gestalt.h>
  #endif
  
  typedef GWorldPtr Pixmap;
  
+ #if TARGET_API_MAC_CARBON
+ typedef struct OpaqueWindowPtr *Window;
+ #define Cursor ThemeCursor
+ #define No_Cursor (-1)
+ #else
+ typedef WindowPtr Window;
+ #define SetPortWindowPort(w) SetPort(w)
+ #define Cursor CursHandle
+ #define No_Cursor (0)
+ extern CursPtr arrow_cursor;
+ #endif
+ 
  #define FACE_DEFAULT (~0)