Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix Mac build with Xcode 8

Browse Source 
Small issues in GHOST
- use NSApplicationDelegate protocol for our app delegate
- make sure NSApp is initialized before using
(cherry picked from commit df7be04ca6)
This commit is contained in:
Mike Erwin
2016-09-14 16:23:48 +02:00
parent 30a7e75089
commit 804f6bf31e
1 changed files with 56 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
intern/ghost/intern/GHOST_SystemCocoa.mm
View File

@@ -285,7 +285,7 @@ extern "C" int GHOST_HACK_getFirstFile(char buf[FIRSTFILEBUFLG])
* CocoaAppDelegate * CocoaAppDelegate
* ObjC object to capture applicationShouldTerminate, and send quit event * ObjC object to capture applicationShouldTerminate, and send quit event
**/ **/
@interface CocoaAppDelegate : NSObject <NSFileManagerDelegate> { @interface CocoaAppDelegate : NSObject <NSApplicationDelegate> {
GHOST_SystemCocoa *systemCocoa; GHOST_SystemCocoa *systemCocoa;
} }
- (void)setSystemCocoa:(GHOST_SystemCocoa *)sysCocoa; - (void)setSystemCocoa:(GHOST_SystemCocoa *)sysCocoa;
@@ -412,8 +412,7 @@ GHOST_TSuccess GHOST_SystemCocoa::init()
}*/ }*/
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
if (NSApp == nil) { [NSApplication sharedApplication]; // initializes NSApp
[NSApplication sharedApplication];
if ([NSApp mainMenu] == nil) { if ([NSApp mainMenu] == nil) {
NSMenu *mainMenubar = [[NSMenu alloc] init]; NSMenu *mainMenubar = [[NSMenu alloc] init];
@@ -470,7 +469,7 @@ GHOST_TSuccess GHOST_SystemCocoa::init()
[NSApp setWindowsMenu:windowMenu]; [NSApp setWindowsMenu:windowMenu];
[windowMenu release]; [windowMenu release];
} }
}
if ([NSApp delegate] == nil) { if ([NSApp delegate] == nil) {
CocoaAppDelegate *appDelegate = [[CocoaAppDelegate alloc] init]; CocoaAppDelegate *appDelegate = [[CocoaAppDelegate alloc] init];
[appDelegate setSystemCocoa:this]; [appDelegate setSystemCocoa:this];