From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Wed, 16 Mar 2005 03:27:38 +0000 (+0000)
Subject: [!TARGET_API_MAC_CARBON]: Include Appearance.h and Controls.h.  Use
X-Git-Tag: ttn-vms-21-2-B4~1791
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2f063626d3398bbe02ca76e11be49c2f40c1a460;p=emacs.git

[!TARGET_API_MAC_CARBON]: Include Appearance.h and Controls.h.  Use
ThemeCursor instead of CursHandle.
---

diff --git a/src/macgui.h b/src/macgui.h
index 6a961318b76..9cddd8101e7 100644
--- a/src/macgui.h
+++ b/src/macgui.h
@@ -68,22 +68,17 @@ typedef unsigned long Time;
 #else /* not HAVE_CARBON */
 #include <QuickDraw.h>		/* for WindowPtr */
 #include <QDOffscreen.h>	/* for GWorldPtr */
+#include <Appearance.h>		/* for ThemeCursor */
 #include <Windows.h>
+#include <Controls.h>
 #include <Gestalt.h>
 #endif /* not HAVE_CARBON */
 
 typedef WindowPtr Window;
 typedef GWorldPtr Pixmap;
 
-#if TARGET_API_MAC_CARBON
 #define Cursor ThemeCursor
 #define No_Cursor (-1)
-#else
-#define SetPortWindowPort(w) SetPort(w)
-#define Cursor CursHandle
-#define No_Cursor (0)
-extern CursPtr arrow_cursor;
-#endif
 
 #define FACE_DEFAULT (~0)