diff options
author | Max <post@wickenrode.com> | 2017-03-31 23:48:02 +0200 |
---|---|---|
committer | Max <post@wickenrode.com> | 2017-03-31 23:53:51 +0200 |
commit | 2a6e6504a3ae379d80fb9c4bd19250382b9180ad (patch) | |
tree | 4e4741400adb8184bb8d0f998115821cd5e4c087 /Source/SPTableContent.m | |
parent | 004af0c9d13d5c9f29b3e0e08ee7df025ee56026 (diff) | |
download | sequelpro-2a6e6504a3ae379d80fb9c4bd19250382b9180ad.tar.gz sequelpro-2a6e6504a3ae379d80fb9c4bd19250382b9180ad.tar.bz2 sequelpro-2a6e6504a3ae379d80fb9c4bd19250382b9180ad.zip |
Update source code compatibility
* Remove forward SDK declaration for 10.8 and below (since that is the minimum required development SDK)
* Fix one case where a method unconditionally required a 10.9+ runtime
* Move all of the forward/backward hacks into their own file
Diffstat (limited to 'Source/SPTableContent.m')
-rw-r--r-- | Source/SPTableContent.m | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/Source/SPTableContent.m b/Source/SPTableContent.m index 416b7cd8..0738fe96 100644 --- a/Source/SPTableContent.m +++ b/Source/SPTableContent.m @@ -243,20 +243,16 @@ static NSString *SPTableFilterSetDefaultOperator = @"SPTableFilterSetDefaultOper [nibLoader release]; -#if __MAC_OS_X_VERSION_MAX_ALLOWED >= __MAC_10_7 //let's see if we can use the NSPopover (10.7+) or have to make do with our legacy clone. //this is using reflection right now, as our SDK is 10.8 but our minimum supported version is 10.6 Class popOverClass = NSClassFromString(@"NSPopover"); - if(popOverClass) - { + if(popOverClass) { paginationPopover = [[popOverClass alloc] init]; [paginationPopover setDelegate:(SPTableContent<NSPopoverDelegate> *)self]; [paginationPopover setContentViewController:paginationViewController]; [paginationPopover setBehavior:NSPopoverBehaviorTransient]; } - else -#endif - { + else { [paginationBox setContentView:[paginationViewController view]]; // Add the pagination view to the content area @@ -1638,13 +1634,11 @@ static NSString *SPTableFilterSetDefaultOperator = @"SPTableFilterSetDefaultOper } #endif -#if __MAC_OS_X_VERSION_MAX_ALLOWED >= __MAC_10_7 - (void)popoverDidClose:(NSNotification *)notification { //not to hide the view, but to change the paginationButton [self setPaginationViewVisibility:NO]; } -#endif /** * Show or hide the pagination layer, also changing the first responder as appropriate. @@ -1672,7 +1666,6 @@ static NSString *SPTableFilterSetDefaultOperator = @"SPTableFilterSetDefaultOper } } -#if __MAC_OS_X_VERSION_MAX_ALLOWED >= __MAC_10_7 if(paginationPopover) { if(makeVisible) { [paginationPopover showRelativeToRect:[paginationButton bounds] ofView:paginationButton preferredEdge:NSMinYEdge]; @@ -1684,7 +1677,6 @@ static NSString *SPTableFilterSetDefaultOperator = @"SPTableFilterSetDefaultOper } return; } -#endif if (makeVisible) { if (paginationViewFrame.size.height == paginationViewHeight) return; |