From ebec28c3ebc82691856912b48447098c0924ff7b Mon Sep 17 00:00:00 2001
From: nyamatongwe <nyamatongwe@gmail.com>
Date: Thu, 7 Jun 2012 14:24:29 +1000
Subject: Protect against APIs only available on 10.6+ when building for 10.5.

---
 cocoa/ScintillaCocoa.mm | 14 ++++++++++++++
 cocoa/ScintillaView.mm  |  2 ++
 2 files changed, 16 insertions(+)

diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm
index 0518d292d..afb0d35cb 100644
--- a/cocoa/ScintillaCocoa.mm
+++ b/cocoa/ScintillaCocoa.mm
@@ -15,7 +15,9 @@
  */
 
 #import <Cocoa/Cocoa.h>
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5
 #import <QuartzCore/CAGradientLayer.h>
+#endif
 #import <QuartzCore/CAAnimation.h>
 #import <QuartzCore/CATransaction.h>
 
@@ -137,6 +139,10 @@ static const KeyToCommand macMapDefault[] =
 
 //--------------------------------------------------------------------------------------------------
 
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5
+
+// Only implement FindHighlightLayer on OS X 10.6+
+
 /**
  * Class to display the animated gold roundrect used on OS X for matches.
  */
@@ -295,6 +301,8 @@ const CGFloat paddingHighlightY = 2;
 
 @end
 
+#endif
+
 //--------------------------------------------------------------------------------------------------
 
 @implementation TimerTarget
@@ -2038,6 +2046,7 @@ void ScintillaCocoa::ActiveStateChanged(bool isActive)
 
 void ScintillaCocoa::ShowFindIndicatorForRange(NSRange charRange, BOOL retaining)
 {
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5
   NSView *content = ContentView();
   if (!layerFindIndicator)
   {
@@ -2078,10 +2087,12 @@ void ScintillaCocoa::ShowFindIndicatorForRange(NSRange charRange, BOOL retaining
   {
     [layerFindIndicator hideMatch];
   }
+#endif
 }
 
 void ScintillaCocoa::MoveFindIndicatorWithBounce(BOOL bounce)
 {
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5
   if (layerFindIndicator)
   {
     NSView *content = ContentView();
@@ -2091,14 +2102,17 @@ void ScintillaCocoa::MoveFindIndicatorWithBounce(BOOL bounce)
     ptText.y = rcBounds.size.height - WndProc(SCI_POINTYFROMPOSITION, 0, layerFindIndicator.positionFind);
     [layerFindIndicator animateMatch:ptText bounce:bounce];
   }
+#endif
 }
 
 void ScintillaCocoa::HideFindIndicator()
 {
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5
   if (layerFindIndicator)
   {
     [layerFindIndicator hideMatch];
   }
+#endif
 }
 
 
diff --git a/cocoa/ScintillaView.mm b/cocoa/ScintillaView.mm
index 67d79665e..3cdc612c7 100644
--- a/cocoa/ScintillaView.mm
+++ b/cocoa/ScintillaView.mm
@@ -642,6 +642,7 @@ NSString *SCIUpdateUINotification = @"SCIUpdateUI";
  */
 - (void) magnifyWithEvent: (NSEvent *) event
 {
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5
   CGFloat z = [event magnification];
   
   // Zoom out or in 1pt depending on sign of magnification event value (0.0 = no change)
@@ -649,6 +650,7 @@ NSString *SCIUpdateUINotification = @"SCIUpdateUI";
     [ScintillaView directCall: self message: SCI_ZOOMOUT wParam: 0 lParam: 0];
   else if (z >= 0.0)
     [ScintillaView directCall: self message: SCI_ZOOMIN wParam: 0 lParam: 0];
+#endif
 }
 
 //--------------------------------------------------------------------------------------------------
-- 
cgit v1.2.3