(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 fb6f858c5475721d4ebc2876e4805792b5af2a2f..2990537076326c0ee78211c2cb490e5f91533a9e 100644 (file)
--- 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