Conditional compiling of iOS 7 only features

Andrea Bizzotto · Andrea Bizzotto · commit 012ce8b230f1 · 2013-09-18T13:51:57.000+01:00
diff --git a/WYPopoverController/WYPopoverController.m b/WYPopoverController/WYPopoverController.m
@@ -25,8 +25,9 @@ of this software and associated documentation files (the "Software"), to deal
 
 #import "WYPopoverController.h"
 
-// TODO: Enable when ios 7 base sdk is enabled
-//#define COMPILE_WITH_IOS7_SUPPORT
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 70000
+    #define WY_BASE_SDK_7_ENABLED
+#endif
 
 #ifdef DEBUG
     #define WY_LOG(fmt, ...)		NSLog((@"%s (%d) : " fmt), __PRETTY_FUNCTION__, __LINE__, ##__VA_ARGS__)
@@ -1319,7 +1320,7 @@ - (CGSize)popoverContentSize
 {
     CGSize result = CGSizeZero;
     
-#ifdef COMPILE_WITH_IOS7_SUPPORT
+#ifdef WY_BASE_SDK_7_ENABLED
     if ([viewController respondsToSelector:@selector(preferredContentSize)])
     {
         result = [viewController preferredContentSize];
@@ -1338,7 +1339,7 @@ - (CGSize)popoverContentSize
 
 - (void)setPopoverContentSize:(CGSize)size
 {
-#ifdef COMPILE_WITH_IOS7_SUPPORT
+#ifdef WY_BASE_SDK_7_ENABLED
     if ([viewController respondsToSelector:@selector(setPreferredContentSize:)])
     {
         [viewController setPreferredContentSize:size];
@@ -1359,7 +1360,7 @@ - (CGSize)contentSizeForViewInPopover
 {
     CGSize result = CGSizeZero;
     
-#ifdef COMPILE_WITH_IOS7_SUPPORT
+#ifdef WY_BASE_SDK_7_ENABLED
     if ([viewController respondsToSelector:@selector(preferredContentSize)])
     {
         result = viewController.preferredContentSize;

Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,9 @@ of this software and associated documentation files (the "Software"), to deal`
`25`	`25`
`26`	`26`	`#import "WYPopoverController.h"`
`27`	`27`
`28`		`-// TODO: Enable when ios 7 base sdk is enabled`
`29`		`-//#define COMPILE_WITH_IOS7_SUPPORT`
	`28`	`+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 70000`
	`29`	`+ #define WY_BASE_SDK_7_ENABLED`
	`30`	`+#endif`
`30`	`31`
`31`	`32`	`#ifdef DEBUG`
`32`	`33`	`#define WY_LOG(fmt, ...) NSLog((@"%s (%d) : " fmt), __PRETTY_FUNCTION__, __LINE__, ##__VA_ARGS__)`
`@@ -1319,7 +1320,7 @@ - (CGSize)popoverContentSize`
`1319`	`1320`	`{`
`1320`	`1321`	`CGSize result = CGSizeZero;`
`1321`	`1322`
`1322`		`-#ifdef COMPILE_WITH_IOS7_SUPPORT`
	`1323`	`+#ifdef WY_BASE_SDK_7_ENABLED`
`1323`	`1324`	`if ([viewController respondsToSelector:@selector(preferredContentSize)])`
`1324`	`1325`	`{`
`1325`	`1326`	`result = [viewController preferredContentSize];`
`@@ -1338,7 +1339,7 @@ - (CGSize)popoverContentSize`
`1338`	`1339`
`1339`	`1340`	`- (void)setPopoverContentSize:(CGSize)size`
`1340`	`1341`	`{`
`1341`		`-#ifdef COMPILE_WITH_IOS7_SUPPORT`
	`1342`	`+#ifdef WY_BASE_SDK_7_ENABLED`
`1342`	`1343`	`if ([viewController respondsToSelector:@selector(setPreferredContentSize:)])`
`1343`	`1344`	`{`
`1344`	`1345`	`[viewController setPreferredContentSize:size];`
`@@ -1359,7 +1360,7 @@ - (CGSize)contentSizeForViewInPopover`
`1359`	`1360`	`{`
`1360`	`1361`	`CGSize result = CGSizeZero;`
`1361`	`1362`
`1362`		`-#ifdef COMPILE_WITH_IOS7_SUPPORT`
	`1363`	`+#ifdef WY_BASE_SDK_7_ENABLED`
`1363`	`1364`	`if ([viewController respondsToSelector:@selector(preferredContentSize)])`
`1364`	`1365`	`{`
`1365`	`1366`	`result = viewController.preferredContentSize;`