From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Fri, 22 Jun 2007 09:05:25 +0000 (+0000)
Subject: (USE_CG_DRAWING): Don't require USE_ATSUI.
X-Git-Tag: emacs-pretest-23.0.90~12155
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=aab3344421bd140cf513c3ab3264728746343f96;p=emacs.git

(USE_CG_DRAWING): Don't require USE_ATSUI.
(USE_MAC_TOOLBAR): Require USE_CG_DRAWING.
---

diff --git a/src/macgui.h b/src/macgui.h
index fb6f858c547..29905370763 100644
--- a/src/macgui.h
+++ b/src/macgui.h
@@ -98,7 +98,7 @@ typedef unsigned long Time;
 /* 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
@@ -119,7 +119,7 @@ typedef unsigned long Time;
 
 /* Whether to use HIToolbar.  */
 #ifndef USE_MAC_TOOLBAR
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1030 && MAC_OS_X_VERSION_MIN_REQUIRED != 1020
+#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