From 67df7006154c66de2c367e14dd74019ad5e3ea15 Mon Sep 17 00:00:00 2001
From: Bjorn Winckler <bjorn.winckler@gmail.com>
Date: Tue, 1 Sep 2009 22:43:56 +0200
Subject: [PATCH] Disable the ATSUI renderer on 10.6

ATSUI has been deprecated on 10.6.  As it stands the ATSUI renderer does
not even work and it spews out masses of warnings when building, so
ATSUI is disabled when compiling for 10.6 for now.
---
 src/MacVim/MMAtsuiTextView.h | 4 ++++
 src/MacVim/MMAtsuiTextView.m | 4 ++++
 src/MacVim/MMVimView.m       | 5 ++++-
 src/MacVim/Miscellaneous.h   | 5 +++++
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/MacVim/MMAtsuiTextView.h b/src/MacVim/MMAtsuiTextView.h
index eead8cf5c3..9f588d89d6 100644
--- a/src/MacVim/MMAtsuiTextView.h
+++ b/src/MacVim/MMAtsuiTextView.h
@@ -8,6 +8,8 @@
  * See README.txt for an overview of the Vim source code.
  */
 
+#if ENABLE_ATSUI
+
 #import <Cocoa/Cocoa.h>
 #import "MMTextView.h"
 
@@ -97,3 +99,5 @@ enum { MMMaxCellsPerChar = 2 };
 - (NSSize)constrainRows:(int *)rows columns:(int *)cols toSize:(NSSize)size;
 
 @end
+
+#endif // ENABLE_ATSUI
diff --git a/src/MacVim/MMAtsuiTextView.m b/src/MacVim/MMAtsuiTextView.m
index bdc55ac1d4..11c2774047 100644
--- a/src/MacVim/MMAtsuiTextView.m
+++ b/src/MacVim/MMAtsuiTextView.m
@@ -25,6 +25,8 @@
  * resized.
  */
 
+#if ENABLE_ATSUI
+
 #import "MMAppController.h"
 #import "MMAtsuiTextView.h"
 #import "MMTextViewHelper.h"
@@ -1268,3 +1270,5 @@ defaultLineHeightForFont(NSFont *font)
 }
 
 @end // MMAtsuiTextView (Drawing)
+
+#endif // ENABLE_ATSUI
diff --git a/src/MacVim/MMVimView.m b/src/MacVim/MMVimView.m
index 3643b3214c..85ea90857c 100644
--- a/src/MacVim/MMVimView.m
+++ b/src/MacVim/MMVimView.m
@@ -89,13 +89,16 @@ enum {
     [self setAutoresizesSubviews:YES];
 
     NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
+#if ENABLE_ATSUI
     if ([ud boolForKey:MMAtsuiRendererKey]) {
         // Use ATSUI for text rendering.
         //
         // HACK! 'textView' has type MMTextView, but MMAtsuiTextView is not
         // derived from MMTextView.
         textView = [[MMAtsuiTextView alloc] initWithFrame:frame];
-    } else {
+    } else
+#endif // ENABLE_ATSUI
+    {
         // Use Cocoa text system for text rendering.
         textView = [[MMTextView alloc] initWithFrame:frame];
     }
diff --git a/src/MacVim/Miscellaneous.h b/src/MacVim/Miscellaneous.h
index 9b66ecdeb8..c650870747 100644
--- a/src/MacVim/Miscellaneous.h
+++ b/src/MacVim/Miscellaneous.h
@@ -16,6 +16,11 @@
 // TODO: Remove this when the inline IM code has been tested
 #define INCLUDE_OLD_IM_CODE
 
+// Disable ATSUI when compiling on 10.6.  This is because ATSUI is deprecated
+// on 10.6 and hence spews out masses of warning messages when building.  Also,
+// the ATSUI code currently does not work on 10.6.
+#define MM_ENABLE_ATSUI (MAC_OS_X_VERSION_MIN_REQUIRED<MAC_OS_X_VERSION_10_6)
+
 
 // NSUserDefaults keys
 extern NSString *MMTabMinWidthKey;