diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-10-31 17:21:12 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-10-31 17:27:03 +0300 |
| commit | 941484ff81744ad2dca1741f3e9c4b4c18664a82 (patch) | |
| tree | 3d80e516e39a7d55be8439c2ce3e06943de0a3f6 /intern/ghost | |
| parent | 0dd98af2559b89149f2b6ae586969c0544c26369 (diff) | |
| parent | 7fb393f9ba3866026c8fb2c5c5ef7e0906cfe8b4 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/ghost')
| -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; } |