adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reimplement log_displayBox on macOS.

Browse Source 
NSRunCriticalAlertPanel was replaced with the NSAlert class in 10.3
and deprecated in 10.10. This rewrite uses that class instead.

Furthermore, original comments to the contrary, we are not compiling
with ARC and need to actually release the classes we create and allow
for an autorelease pool.
This commit is contained in:
Michael Martin
2020-06-09 18:54:32 -07:00
parent 6093fb467c
commit 1faf6c87c3
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/libs/log/msgbox_macosx.m
+14 -9
View File
@@ -21,17 +21,22 @@ void
log_displayBox (const /*UTF-8*/char *title, int isError,
const /*UTF-8*/char *msg)
{
NSString *titleStr = [NSString stringWithUTF8String:title];
NSString *msgStr = [NSString stringWithUTF8String:msg];
@autoreleasepool {
NSAlert *alert = [[NSAlert alloc] init];
NSString *titleStr = [NSString stringWithUTF8String:title];
NSString *msgStr = [NSString stringWithUTF8String:msg];
if (!titleStr || !msgStr)
return; // Oops, out of memory?
if (alert && titleStr && msgStr) {
alert.alertStyle = isError ? NSAlertStyleCritical : NSAlertStyleInformational;
alert.messageText = titleStr;
alert.informativeText = msgStr;
if (isError)
NSRunCriticalAlertPanel (titleStr, @"%@", nil, nil, nil, msgStr);
else
NSRunInformationalAlertPanel (titleStr, @"%@", nil, nil, nil, msgStr);
[alert runModal];
}
// titleStr and msgStr are autoreleased
[msgStr release];
[titleStr release];
[alert release];
}
}