diff options
author | Arto Kitula <arto.kitula@gmail.com> | 2017-10-31 12:30:55 +0300 |
---|---|---|
committer | Arto Kitula <arto.kitula@gmail.com> | 2017-10-31 12:30:55 +0300 |
commit | 076abf6cd8c39b03d7a1e2b32cda213e97c8e6e8 (patch) | |
tree | 1d0dc4bdce548b0ec46ba231627d789e9fae5790 /intern | |
parent | 98052162e1338cb8f97832c3e7e1d65d8bfd9b3f (diff) |
MacOS: Use correct Cocoa protocol on any compiler
Diffstat (limited to 'intern')
-rw-r--r-- | intern/ghost/intern/GHOST_SystemCocoa.mm | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm b/intern/ghost/intern/GHOST_SystemCocoa.mm index b4fb788bca9..e9fffb6f60b 100644 --- a/intern/ghost/intern/GHOST_SystemCocoa.mm +++ b/intern/ghost/intern/GHOST_SystemCocoa.mm @@ -283,16 +283,7 @@ extern "C" int GHOST_HACK_getFirstFile(char buf[FIRSTFILEBUFLG]) * CocoaAppDelegate * ObjC object to capture applicationShouldTerminate, and send quit event **/ -#if defined(__clang_major__) && __clang_major__ <= 7 -/* FIXME(merwin & Juicyfruit): long-term fix for proper protocol to use - * merwin thinks NSApplicationDelegate is the correct protocol here. Has been around since 10.6 so we should be good... what's the problem? - * https://developer.apple.com/reference/appkit/nsapplicationdelegate?language=objc - */ -@interface CocoaAppDelegate : NSObject <NSFileManagerDelegate> { -#else -/* for Xcode 8 */ @interface CocoaAppDelegate : NSObject <NSApplicationDelegate> { -#endif GHOST_SystemCocoa *systemCocoa; } |