Build fixes for iOS 6

Andrea Bizzotto · Andrea Bizzotto · commit 865044e346be · 2013-09-18T09:52:29.000+01:00
diff --git a/WYPopoverController/WYPopoverController.h b/WYPopoverController/WYPopoverController.h
@@ -46,7 +46,7 @@ typedef NS_OPTIONS(NSUInteger, WYPopoverArrowDirection) {
 
 @interface WYPopoverBackgroundView : UIView
 
-@property (nonatomic, strong) UIColor *strokeColor              UI_APPEARANCE_SELECTOR DEPRECATED_MSG_ATTRIBUTE("WYPopoverController [0.1.3] : Use 'outerStrokeColor' instead.");
+@property (nonatomic, strong) UIColor *strokeColor              UI_APPEARANCE_SELECTOR __attribute((deprecated("WYPopoverController [0.1.3] : Use 'outerStrokeColor' instead.")));
 
 @property (nonatomic, strong) UIColor *tintColor                UI_APPEARANCE_SELECTOR;
 @property (nonatomic, strong) UIColor *fillTopColor             UI_APPEARANCE_SELECTOR;
diff --git a/WYPopoverController/WYPopoverController.m b/WYPopoverController/WYPopoverController.m
@@ -25,6 +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
+
 #ifdef DEBUG
     #define WY_LOG(fmt, ...)		NSLog((@"%s (%d) : " fmt), __PRETTY_FUNCTION__, __LINE__, ##__VA_ARGS__)
 #else
@@ -1316,11 +1319,13 @@ - (CGSize)popoverContentSize
 {
     CGSize result = CGSizeZero;
     
+#ifdef COMPILE_WITH_IOS7_SUPPORT
     if ([viewController respondsToSelector:@selector(preferredContentSize)])
     {
         result = [viewController preferredContentSize];
     }
     else
+#endif
     {
 #pragma clang diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated"
@@ -1333,11 +1338,13 @@ - (CGSize)popoverContentSize
 
 - (void)setPopoverContentSize:(CGSize)size
 {
+#ifdef COMPILE_WITH_IOS7_SUPPORT
     if ([viewController respondsToSelector:@selector(setPreferredContentSize:)])
     {
         [viewController setPreferredContentSize:size];
     }
     else
+#endif
     {
 #pragma clang diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated"
@@ -1352,11 +1359,12 @@ - (CGSize)contentSizeForViewInPopover
 {
     CGSize result = CGSizeZero;
     
+#ifdef COMPILE_WITH_IOS7_SUPPORT
     if ([viewController respondsToSelector:@selector(preferredContentSize)])
     {
         result = viewController.preferredContentSize;
     }
-    
+#endif
     if (CGSizeEqualToSize(result, CGSizeZero))
     {
 #pragma clang diagnostic push

Original file line number	Diff line number	Diff line change
`@@ -25,6 +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`
	`30`	`+`
`28`	`31`	`#ifdef DEBUG`
`29`	`32`	`#define WY_LOG(fmt, ...) NSLog((@"%s (%d) : " fmt), __PRETTY_FUNCTION__, __LINE__, ##__VA_ARGS__)`
`30`	`33`	`#else`
`@@ -1316,11 +1319,13 @@ - (CGSize)popoverContentSize`
`1316`	`1319`	`{`
`1317`	`1320`	`CGSize result = CGSizeZero;`
`1318`	`1321`
	`1322`	`+#ifdef COMPILE_WITH_IOS7_SUPPORT`
`1319`	`1323`	`if ([viewController respondsToSelector:@selector(preferredContentSize)])`
`1320`	`1324`	`{`
`1321`	`1325`	`result = [viewController preferredContentSize];`
`1322`	`1326`	`}`
`1323`	`1327`	`else`
	`1328`	`+#endif`
`1324`	`1329`	`{`
`1325`	`1330`	`#pragma clang diagnostic push`
`1326`	`1331`	`#pragma GCC diagnostic ignored "-Wdeprecated"`
`@@ -1333,11 +1338,13 @@ - (CGSize)popoverContentSize`
`1333`	`1338`
`1334`	`1339`	`- (void)setPopoverContentSize:(CGSize)size`
`1335`	`1340`	`{`
	`1341`	`+#ifdef COMPILE_WITH_IOS7_SUPPORT`
`1336`	`1342`	`if ([viewController respondsToSelector:@selector(setPreferredContentSize:)])`
`1337`	`1343`	`{`
`1338`	`1344`	`[viewController setPreferredContentSize:size];`
`1339`	`1345`	`}`
`1340`	`1346`	`else`
	`1347`	`+#endif`
`1341`	`1348`	`{`
`1342`	`1349`	`#pragma clang diagnostic push`
`1343`	`1350`	`#pragma GCC diagnostic ignored "-Wdeprecated"`
`@@ -1352,11 +1359,12 @@ - (CGSize)contentSizeForViewInPopover`
`1352`	`1359`	`{`
`1353`	`1360`	`CGSize result = CGSizeZero;`
`1354`	`1361`
	`1362`	`+#ifdef COMPILE_WITH_IOS7_SUPPORT`
`1355`	`1363`	`if ([viewController respondsToSelector:@selector(preferredContentSize)])`
`1356`	`1364`	`{`
`1357`	`1365`	`result = viewController.preferredContentSize;`
`1358`	`1366`	`}`
`1359`		`-`
	`1367`	`+#endif`
`1360`	`1368`	`if (CGSizeEqualToSize(result, CGSizeZero))`
`1361`	`1369`	`{`
`1362`	`1370`	`#pragma clang diagnostic push`