aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYAMAMOTO Mitsuharu2007-06-22 09:05:25 +0000
committerYAMAMOTO Mitsuharu2007-06-22 09:05:25 +0000
commitaab3344421bd140cf513c3ab3264728746343f96 (patch)
treedabd4dac00d45d54f9debc52ad7e945550719b3a
parent31a0385deed474cdffb373c4b13cfb58c7d4932d (diff)
downloademacs-aab3344421bd140cf513c3ab3264728746343f96.tar.gz
emacs-aab3344421bd140cf513c3ab3264728746343f96.zip
(USE_CG_DRAWING): Don't require USE_ATSUI.
(USE_MAC_TOOLBAR): Require USE_CG_DRAWING.
-rw-r--r--src/macgui.h4
1 files changed, 2 insertions, 2 deletions
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;
98/* Whether to use Quartz 2D routines for drawing operations other than 98/* Whether to use Quartz 2D routines for drawing operations other than
99 texts. */ 99 texts. */
100#ifndef USE_CG_DRAWING 100#ifndef USE_CG_DRAWING
101#if USE_ATSUI && MAC_OS_X_VERSION_MAX_ALLOWED >= 1020 101#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1020
102#define USE_CG_DRAWING 1 102#define USE_CG_DRAWING 1
103#endif 103#endif
104#endif 104#endif
@@ -119,7 +119,7 @@ typedef unsigned long Time;
119 119
120/* Whether to use HIToolbar. */ 120/* Whether to use HIToolbar. */
121#ifndef USE_MAC_TOOLBAR 121#ifndef USE_MAC_TOOLBAR
122#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1030 && MAC_OS_X_VERSION_MIN_REQUIRED != 1020 122#if USE_CG_DRAWING && MAC_OS_X_VERSION_MAX_ALLOWED >= 1030 && MAC_OS_X_VERSION_MIN_REQUIRED != 1020
123#define USE_MAC_TOOLBAR 1 123#define USE_MAC_TOOLBAR 1
124#endif 124#endif
125#endif 125#endif