# HG changeset patch
# User YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
# Date 1206751571 0
# Node ID f89745e778b8b374b84952dc7fe64e405a4ed96e
# Parent  2ae7357bc8f4f27d3666ee35ea27537b83f01ac4
Replace WindowPtr with WindowRef.
(USE_MAC_TOOLBAR): New define.
(USE_CG_DRAWING): Don't require USE_ATSUI.

diff -r 2ae7357bc8f4 -r f89745e778b8 src/macgui.h
--- a/src/macgui.h	Sat Mar 29 00:45:58 2008 +0000
+++ b/src/macgui.h	Sat Mar 29 00:46:11 2008 +0000
@@ -71,7 +71,7 @@
 #undef Z
 #define Z (current_buffer->text->z)
 #else /* not HAVE_CARBON */
-#include <QuickDraw.h>		/* for WindowPtr */
+#include <QuickDraw.h>		/* for WindowRef */
 #include <QDOffscreen.h>	/* for GWorldPtr */
 #include <Appearance.h>		/* for ThemeCursor */
 #include <Windows.h>
@@ -98,7 +98,7 @@
 /* Whether to use Quartz 2D routines for drawing operations other than
    texts.  */
 #ifndef USE_CG_DRAWING
-#if USE_ATSUI && MAC_OS_X_VERSION_MAX_ALLOWED >= 1020
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1020
 #define USE_CG_DRAWING 1
 #endif
 #endif
@@ -117,7 +117,14 @@
 #endif
 #endif
 
-typedef WindowPtr Window;
+/* Whether to use HIToolbar.  */
+#ifndef USE_MAC_TOOLBAR
+#if USE_CG_DRAWING && MAC_OS_X_VERSION_MAX_ALLOWED >= 1030 && MAC_OS_X_VERSION_MIN_REQUIRED != 1020
+#define USE_MAC_TOOLBAR 1
+#endif
+#endif
+
+typedef WindowRef Window;
 typedef GWorldPtr Pixmap;
 
 #define Cursor ThemeCursor