blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 752 Projects 19 Wiki Activity

Cleanup: remove use of deprecated macOS API

This commit is contained in:
Brecht Van Lommel 2019-06-01 19:56:52 +02:00
parent e7e52f7cff
commit 593eab66b5
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1341,7 +1341,7 @@ void GHOST_SystemCocoa::handleQuitRequest()
bool GHOST_SystemCocoa::handleOpenDocumentRequest(void *filepathStr)
{
NSString *filepath = (NSString *)filepathStr;
int confirmOpen = NSAlertAlternateReturn;
bool confirmOpen = true;
NSArray *windowsList;
char *temp_buff;
size_t filenameTextSize;
@ -1358,12 +1358,17 @@ bool GHOST_SystemCocoa::handleOpenDocumentRequest(void *filepathStr)
// Check open windows if some changes are not saved
if (m_windowManager->getAnyModifiedState()) {
confirmOpen = NSRunAlertPanel(
[NSString stringWithFormat:@"Opening %@", [filepath lastPathComponent]],
@"Current document has not been saved.\nDo you really want to proceed?",
@"Cancel",
@"Open",
nil);
@autoreleasepool {
NSAlert *alert = [[NSAlert alloc] init];
NSString *title = [NSString stringWithFormat:@"Opening %@", [filepath lastPathComponent]];
NSString *text = @"Current document has not been saved.\nDo you really want to proceed?";
[alert addButtonWithTitle:@"Open"];
[alert addButtonWithTitle:@"Cancel"];
[alert setMessageText:title];
[alert setInformativeText:text];
[alert setAlertStyle:NSAlertStyleInformational];
confirmOpen = [alert runModal] == NSAlertFirstButtonReturn;
}
}
// Give back focus to the blender window
@ -1372,7 +1377,7 @@ bool GHOST_SystemCocoa::handleOpenDocumentRequest(void *filepathStr)
[[windowsList objectAtIndex:0] makeKeyAndOrderFront:nil];
}
if (confirmOpen == NSAlertAlternateReturn) {
if (confirmOpen) {
filenameTextSize = [filepath lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
temp_buff = (char *)malloc(filenameTextSize + 1);