From a1002fc495528d26e5349ef09c56110d89079237 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Tue, 1 Nov 2005 20:15:10 +0000
Subject: [PATCH] just-in-case ATS flags for non-combine mode

svn: r1200
---
 src/wxmac/src/mac/wx_dccan3.cc | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/wxmac/src/mac/wx_dccan3.cc b/src/wxmac/src/mac/wx_dccan3.cc
index 9cb7ff1a13..11c092cfe5 100644
--- a/src/wxmac/src/mac/wx_dccan3.cc
+++ b/src/wxmac/src/mac/wx_dccan3.cc
@@ -1077,15 +1077,15 @@ static double DrawMeasUnicodeText(const char *text, int d, int theStrlen, int uc
 	  ATSUAttributeValuePtr ll_theValues[2];
 	  ATSLineLayoutOptions ll_attribs;
 
+	  ll_attribs = (kATSLineHasNoHangers
+			| kATSLineHasNoOpticalAlignment);
+
 	  if (qd_spacing) {
-	    ll_attribs = (kATSLineFractDisable 
-			  | kATSLineDisableAutoAdjustDisplayPos
-			  | kATSLineDisableAllLayoutOperations
-			  | kATSLineUseDeviceMetrics
-			  | (use_cgctx ? 0 : kATSLineUseQDRendering));
-	  } else {
-	    ll_attribs = (kATSLineHasNoHangers
-			  | kATSLineHasNoOpticalAlignment);
+	    ll_attribs |= (kATSLineFractDisable 
+			   | kATSLineDisableAutoAdjustDisplayPos
+			   | kATSLineDisableAllLayoutOperations
+			   | kATSLineUseDeviceMetrics
+			   | (use_cgctx ? 0 : kATSLineUseQDRendering));
 	  }
 	  ll_theTags[cnt] = kATSULineLayoutOptionsTag;
 	  ll_theSizes[cnt] = sizeof(ATSLineLayoutOptions);