diff options
| author | Max <post@wickenrode.com> | 2014-12-13 21:00:30 +0100 |
|---|---|---|
| committer | Max <post@wickenrode.com> | 2014-12-13 21:00:30 +0100 |
| commit | c573bf18ff0ce2a350bec687f2d7cc5ba5a69865 (patch) | |
| tree | 508f9b880f6f8465065aedb3a4bb045fcaa753cb | |
| parent | d5dd8b1eb5b8bfaa040ddc52d603231e4828cec7 (diff) | |
| download | sequelpro-c573bf18ff0ce2a350bec687f2d7cc5ba5a69865.tar.gz sequelpro-c573bf18ff0ce2a350bec687f2d7cc5ba5a69865.tar.bz2 sequelpro-c573bf18ff0ce2a350bec687f2d7cc5ba5a69865.zip | |
Attempt 2 to fix building on 10.7, 10.8
| -rw-r--r-- | Source/DMLocalizedNibBundle.m | 5 | ||||
| -rw-r--r-- | Source/SPActivityTextFieldCell.m | 5 | ||||
| -rw-r--r-- | Source/SPConstants.h | 16 | ||||
| -rw-r--r-- | Source/SPTableContent.m | 4 | ||||
| -rw-r--r-- | Source/SPTextAndLinkCell.m | 4 |
5 files changed, 16 insertions, 18 deletions
diff --git a/Source/DMLocalizedNibBundle.m b/Source/DMLocalizedNibBundle.m index 90fc4264..5dc94f9f 100644 --- a/Source/DMLocalizedNibBundle.m +++ b/Source/DMLocalizedNibBundle.m @@ -12,11 +12,6 @@ #import <objc/runtime.h> #import <Availability.h> -//Backwards compatibility -#ifndef __MAC_10_8 -#define __MAC_10_8 1080 -#endif - @interface NSBundle (DMLocalizedNibBundle) #if __MAC_OS_X_VERSION_MAX_ALLOWED >= __MAC_10_8 - (BOOL)deliciousLocalizingLoadNibNamed:(NSString *)fileName owner:(id)owner topLevelObjects:(NSArray **)topLevelObjects; diff --git a/Source/SPActivityTextFieldCell.m b/Source/SPActivityTextFieldCell.m index c088c9cb..5eb2deda 100644 --- a/Source/SPActivityTextFieldCell.m +++ b/Source/SPActivityTextFieldCell.m @@ -33,11 +33,6 @@ #define FAVORITE_NAME_FONT_SIZE 12.0f -#ifndef NS_OPTIONS -// This type is available since 10.5 but only got a "name" in 10.8 -typedef NSUInteger NSCellHitResult; -#endif - @interface SPActivityTextFieldCell (PrivateAPI) - (NSAttributedString *)constructSubStringAttributedString; diff --git a/Source/SPConstants.h b/Source/SPConstants.h index 322219ae..f630dd49 100644 --- a/Source/SPConstants.h +++ b/Source/SPConstants.h @@ -609,3 +609,19 @@ extern NSString *SPURLSchemeQueryResultStatusPathHeader; extern NSString *SPURLSchemeQueryResultMetaPathHeader; #define SPAppDelegate ((SPAppController *)[NSApp delegate]) + +//Backwards compatibility +#ifndef __MAC_10_7 +#define __MAC_10_7 1070 +#endif +#ifndef __MAC_10_8 +#define __MAC_10_8 1080 +#endif +#ifndef __MAC_10_10 +#define __MAC_10_10 101000 +#endif + +// This enum is available since 10.5 but only got a "name" in 10.10 +#if __MAC_OS_X_VERSION_MAX_ALLOWED < __MAC_10_10 +typedef NSUInteger NSCellHitResult; +#endif diff --git a/Source/SPTableContent.m b/Source/SPTableContent.m index 67825671..d904ab73 100644 --- a/Source/SPTableContent.m +++ b/Source/SPTableContent.m @@ -70,10 +70,6 @@ static NSString *SPTableFilterSetDefaultOperator = @"SPTableFilterSetDefaultOperator"; #endif -#ifndef __MAC_10_7 -#define __MAC_10_7 1070 -#endif - @interface SPTableContent (SPTableContentDataSource_Private_API) - (id)_contentValueForTableColumn:(NSUInteger)columnIndex row:(NSUInteger)rowIndex asPreview:(BOOL)asPreview; diff --git a/Source/SPTextAndLinkCell.m b/Source/SPTextAndLinkCell.m index 86d8ca9d..89521e54 100644 --- a/Source/SPTextAndLinkCell.m +++ b/Source/SPTextAndLinkCell.m @@ -42,10 +42,6 @@ static inline NSRect SPTextLinkRectFromCellRect(NSRect inRect) return NSMakeRect(inRect.origin.x + inRect.size.width - 15, inRect.origin.y - 1, 12, inRect.size.height); } -#ifndef NS_OPTIONS -// This type is available since 10.5 but only got a "name" in 10.8 -typedef NSUInteger NSCellHitResult; -#endif #pragma mark - #pragma mark Setup and teardown |