Updated for latest Xcode and integrate PR #9

sbooth · Feb 10, 2018 · 40b683d · sbooth · Feb 10, 2018 · 40b683d
1 parent 3a7bcb5
commit 40b683d
Show file tree

Hide file tree

Showing 14 changed files with 1,187 additions and 5,945 deletions.
diff --git a/COPYING b/COPYING
@@ -1,4 +1,4 @@
-Copyright (C) 2011, 2012, 2013, 2014, 2015 Stephen F. Booth <me@sbooth.org>
+Copyright (C) 2011 - 2018 Stephen F. Booth <me@sbooth.org>
 All Rights Reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/ExampleAppDelegate.h b/ExampleAppDelegate.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2011, 2012, 2013, 2014, 2015 Stephen F. Booth <me@sbooth.org>
+ *  Copyright (C) 2011 - 2018 Stephen F. Booth <me@sbooth.org>
  *  All Rights Reserved.
  *
  *  Redistribution and use in source and binary forms, with or without

diff --git a/ExampleAppDelegate.m b/ExampleAppDelegate.m
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2011, 2012, 2013, 2014, 2015 Stephen F. Booth <me@sbooth.org>
+ *  Copyright (C) 2011 - 2018 Stephen F. Booth <me@sbooth.org>
  *  All Rights Reserved.
  *
  *  Redistribution and use in source and binary forms, with or without

diff --git a/SFBPopover.h b/SFBPopover.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2011, 2012, 2013, 2014, 2015 Stephen F. Booth <me@sbooth.org>
+ *  Copyright (C) 2011 - 2018 Stephen F. Booth <me@sbooth.org>
  *  All Rights Reserved.
  *
  *  Redistribution and use in source and binary forms, with or without
@@ -59,8 +59,8 @@ typedef NS_ENUM(NSUInteger, SFBPopoverPosition) {
 
 // ========================================
 // Creation
-- (nullable id) initWithContentView:(nonnull NSView *)contentView;
-- (nullable id) initWithContentViewController:(nonnull NSViewController *)contentViewController;
+- (nullable instancetype) initWithContentView:(nonnull NSView *)contentView;
+- (nullable instancetype) initWithContentViewController:(nonnull NSViewController *)contentViewController;
 
 // ========================================
 // Geometry determination

diff --git a/SFBPopover.m b/SFBPopover.m
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2011, 2012, 2013, 2014, 2015 Stephen F. Booth <me@sbooth.org>
+ *  Copyright (C) 2011 - 2018 Stephen F. Booth <me@sbooth.org>
  *  All Rights Reserved.
  *
  *  Redistribution and use in source and binary forms, with or without
@@ -33,7 +33,7 @@
 #include <QuartzCore/QuartzCore.h>
 
 // A custom delegate class is used since CAAnimation retains its delegate
-@interface SFBPopoverAnimationDelegate : NSObject
+@interface SFBPopoverAnimationDelegate : NSObject <CAAnimationDelegate>
 {
 @private
 	__weak SFBPopoverWindow *_popoverWindow;
@@ -81,22 +81,22 @@ - (SFBPopoverWindowFrame *) popoverWindowFrame;
 
 @implementation SFBPopover
 
-- (id) initWithContentView:(NSView *)contentView
+- (instancetype) initWithContentView:(NSView *)contentView
 {
 	NSViewController *contentViewController = [[NSViewController alloc] init];
 	[contentViewController setView:contentView];
 	return [self initWithContentViewController:contentViewController];
 }
 
-- (id) initWithContentViewController:(NSViewController *)contentViewController
+- (instancetype) initWithContentViewController:(NSViewController *)contentViewController
 {
 	if((self = [super init])) {
 		_contentViewController = contentViewController;
 		self.animates = YES;
 
 		NSView *contentView = [_contentViewController view];
 		_popoverWindow = [[SFBPopoverWindow alloc] initWithContentRect:[contentView frame] styleMask:0 backing:NSBackingStoreBuffered defer:YES];
-		[_popoverWindow setContentView:contentView];
+		[_popoverWindow setPopoverContentView:contentView];
 		[_popoverWindow setMinSize:[contentView frame].size];
 
 		CAAnimation *animation = [CABasicAnimation animation];

diff --git a/SFBPopoverWindow.h b/SFBPopoverWindow.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2011, 2012, 2013, 2014, 2015 Stephen F. Booth <me@sbooth.org>
+ *  Copyright (C) 2011 - 2018 Stephen F. Booth <me@sbooth.org>
  *  All Rights Reserved.
  *
  *  Redistribution and use in source and binary forms, with or without
@@ -35,6 +35,8 @@
 // ========================================
 @interface SFBPopoverWindow : NSWindow
 
+@property (nonatomic, strong) NSView * _Nullable popoverContentView;
+
 // ========================================
 // Popover window properties
 - (SFBPopoverPosition) popoverPosition;

diff --git a/SFBPopoverWindow.m b/SFBPopoverWindow.m
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2011, 2012, 2013, 2014, 2015 Stephen F. Booth <me@sbooth.org>
+ *  Copyright (C) 2011 - 2018 Stephen F. Booth <me@sbooth.org>
  *  All Rights Reserved.
  *
  *  Redistribution and use in source and binary forms, with or without
@@ -42,7 +42,7 @@ - (SFBPopoverWindowFrame *) popoverWindowFrame;
 
 @implementation SFBPopoverWindow
 
-- (id) initWithContentRect:(NSRect)contentRect styleMask:(NSUInteger)windowStyle backing:(NSBackingStoreType)bufferingType defer:(BOOL)deferCreation
+- (instancetype) initWithContentRect:(NSRect)contentRect styleMask:(NSWindowStyleMask)windowStyle backing:(NSBackingStoreType)bufferingType defer:(BOOL)deferCreation
 {
 #pragma unused(windowStyle)
 	if((self = [super initWithContentRect:contentRect styleMask:NSBorderlessWindowMask backing:bufferingType defer:deferCreation])) {
@@ -52,6 +52,7 @@ - (id) initWithContentRect:(NSRect)contentRect styleMask:(NSUInteger)windowStyle
 		[self setAlphaValue:1];
 		[self setOpaque:NO];
 		[self setHasShadow:YES];
+		[self setLevel:NSFloatingWindowLevel];
 	}
 
 	return self;
@@ -77,12 +78,12 @@ - (BOOL) canBecomeMainWindow
 	return NO;
 }
 
-- (NSView *) contentView
+- (void) setContentView:(NSView *)view
 {
-	return _popoverContentView;
+	[self setPopoverContentView:view];
 }
 
-- (void) setContentView:(NSView *)view
+- (void) setPopoverContentView:(NSView *)view
 {
 	if([_popoverContentView isEqualTo:view])
 		return;

diff --git a/SFBPopoverWindowFrame.h b/SFBPopoverWindowFrame.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2011, 2012, 2013, 2014, 2015 Stephen F. Booth <me@sbooth.org>
+ *  Copyright (C) 2011 - 2018 Stephen F. Booth <me@sbooth.org>
  *  All Rights Reserved.
  *
  *  Redistribution and use in source and binary forms, with or without

diff --git a/SFBPopoverWindowFrame.m b/SFBPopoverWindowFrame.m
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2011, 2012, 2013, 2014, 2015 Stephen F. Booth <me@sbooth.org>
+ *  Copyright (C) 2011 - 2018 Stephen F. Booth <me@sbooth.org>
  *  All Rights Reserved.
  *
  *  Redistribution and use in source and binary forms, with or without
@@ -36,7 +36,7 @@ - (void) appendArrowToPath:(NSBezierPath *)path;
 
 @implementation SFBPopoverWindowFrame
 
-- (id) initWithFrame:(NSRect)frame
+- (instancetype) initWithFrame:(NSRect)frame
 {
 	if((self = [super initWithFrame:frame])) {
 		// Set the default appearance

diff --git a/SFBPopovers-Info.plist b/SFBPopovers-Info.plist
@@ -23,7 +23,7 @@
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2011, 2012, 2013, 2014, 2015 Stephen F. Booth. All rights reserved.</string>
+	<string>Copyright © 2011 - 2018 Stephen F. Booth. All rights reserved.</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>

diff --git a/SFBPopovers-Prefix.pch b/SFBPopovers-Prefix.pch
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2011, 2012, 2013, 2014, 2015 Stephen F. Booth <me@sbooth.org>
+ *  Copyright (C) 2011 - 2018 Stephen F. Booth <me@sbooth.org>
  *  All Rights Reserved.
  *
  *  Redistribution and use in source and binary forms, with or without

diff --git a/SFBPopovers.xcodeproj/project.pbxproj b/SFBPopovers.xcodeproj/project.pbxproj
@@ -213,7 +213,7 @@
 		32CE12BA1367854000CE7985 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0700;
+				LastUpgradeCheck = 0920;
 				ORGANIZATIONNAME = sbooth.org;
 			};
 			buildConfigurationList = 32CE12BD1367854000CE7985 /* Build configuration list for PBXProject "SFBPopovers" */;
@@ -355,8 +355,31 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				ONLY_ACTIVE_ARCH = YES;
 			};
@@ -366,7 +389,30 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.7;
 			};
 			name = Release;