Merge branch 'master' into NSSplitViewController_branch

This commit is contained in:
Gregory John Casamento 2020-07-28 10:26:59 -04:00
commit ed54fdd288
2 changed files with 10 additions and 0 deletions

View file

@ -1,3 +1,9 @@
2020-07-20 Gregory John Casamento <greg.casamento@gmail.com>
* Source/NSAlert.m: Fix NSAlert to have an OK button if none other
is specified. This appears to be the default behavior at this point
according to testing on macOS.
2020-07-19 Gregory John Casamento <greg.casamento@gmail.com>
* Headers/AppKit/AppKit.h: Add include files for NSSegue* and other

View file

@ -2005,6 +2005,10 @@ void NSBeginInformationalAlertSheet(NSString *title,
icon: _icon
title: _message_text != nil ? _message_text : _(@"Alert")
message: _informative_text != nil ? _informative_text : _(@"No information")];
if ([_buttons count] == 0)
{
[self addButtonWithTitle: @"OK"];
}
[panel setButtons: _buttons];
}
}