Commit: 076abf6cd8c39b03d7a1e2b32cda213e97c8e6e8 Author: Arto Kitula Date: Tue Oct 31 11:30:55 2017 +0200 Branches: master https://developer.blender.org/rB076abf6cd8c39b03d7a1e2b32cda213e97c8e6e8
MacOS: Use correct Cocoa protocol on any compiler =================================================================== M intern/ghost/intern/GHOST_SystemCocoa.mm =================================================================== 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; } _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs