gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-22 13:10:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Change arguments names to reduce confusion about their intended use

Browse source
This commit is contained in:
Wolfgang Lux 2020-04-01 13:15:48 +02:00
parent b42691c160
commit 9afab3aaf8
2 changed files with 29 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -2,10 +2,15 @@
* Source/NSAlert.m (NSBeginAlertSheet): Restore call to delegate
method which was lost a while ago.
* Source/NSAlert.m (NSBeginCriticalAlertSheet,
NSBeginInformationalAlertSheet): Remove redundant calls to close
method.
* Source/NSAlert.m (NSBeginAlertSheet, NSBeginCriticalAlertSheet,
NSBeginInformationalAlertSheet): Change arguments names to reduce
confusion about the intended use of the corresponding selectors.
2020-03-26 Fred Kiefer <FredKiefer@gmx.de>
* Documentation/news.texi: Started to fill in some details for

45
Source/NSAlert.m
View file

@ -1651,8 +1651,8 @@ void NSBeginAlertSheet(NSString *title,
NSString *otherButton,
NSWindow *docWindow,
id modalDelegate,
SEL willEndSelector,
SEL didEndSelector,
SEL didDismissSelector,
void *contextInfo,
NSString *msg, ...)
{
@ -1676,14 +1676,15 @@ void NSBeginAlertSheet(NSString *title,
[NSApp beginSheet: panel
modalForWindow: docWindow
modalDelegate: modalDelegate
didEndSelector: willEndSelector
didEndSelector: didEndSelector
contextInfo: contextInfo];
if (modalDelegate && [modalDelegate respondsToSelector: didEndSelector])
if (modalDelegate && [modalDelegate respondsToSelector: didDismissSelector])
{
void (*didEnd)(id, SEL, id, NSInteger, void*);
didEnd = (void (*)(id, SEL, id, NSInteger, void*))[modalDelegate
methodForSelector: didEndSelector];
didEnd(modalDelegate, didEndSelector, panel, [panel result], contextInfo);
void (*didDismiss)(id, SEL, id, NSInteger, void*);
didDismiss = (void (*)(id, SEL, id, NSInteger, void*))[modalDelegate
methodForSelector: didDismissSelector];
didDismiss(modalDelegate, didDismissSelector, panel, [panel result],
contextInfo);
}
NSReleaseAlertPanel(panel);
@ -1695,8 +1696,8 @@ void NSBeginCriticalAlertSheet(NSString *title,
NSString *otherButton,
NSWindow *docWindow,
id modalDelegate,
SEL willEndSelector,
SEL didEndSelector,
SEL didDismissSelector,
void *contextInfo,
NSString *msg, ...)
{
@ -1714,14 +1715,15 @@ void NSBeginCriticalAlertSheet(NSString *title,
[NSApp beginSheet: panel
modalForWindow: docWindow
modalDelegate: modalDelegate
didEndSelector: willEndSelector
didEndSelector: didEndSelector
contextInfo: contextInfo];
if (modalDelegate && [modalDelegate respondsToSelector: didEndSelector])
if (modalDelegate && [modalDelegate respondsToSelector: didDismissSelector])
{
void (*didEnd)(id, SEL, id, NSInteger, void*);
didEnd = (void (*)(id, SEL, id, NSInteger, void*))[modalDelegate
methodForSelector: didEndSelector];
didEnd(modalDelegate, didEndSelector, panel, [panel result], contextInfo);
void (*didDismiss)(id, SEL, id, NSInteger, void*);
didDismiss = (void (*)(id, SEL, id, NSInteger, void*))[modalDelegate
methodForSelector: didDismissSelector];
didDismiss(modalDelegate, didDismissSelector, panel, [panel result],
contextInfo);
}
NSReleaseAlertPanel(panel);
@ -1733,8 +1735,8 @@ void NSBeginInformationalAlertSheet(NSString *title,
NSString *otherButton,
NSWindow *docWindow,
id modalDelegate,
SEL willEndSelector,
SEL didEndSelector,
SEL didDismissSelector,
void *contextInfo,
NSString *msg, ...)
{
@ -1754,14 +1756,15 @@ void NSBeginInformationalAlertSheet(NSString *title,
[NSApp beginSheet: panel
modalForWindow: docWindow
modalDelegate: modalDelegate
didEndSelector: willEndSelector
didEndSelector: didEndSelector
contextInfo: contextInfo];
if (modalDelegate && [modalDelegate respondsToSelector: didEndSelector])
if (modalDelegate && [modalDelegate respondsToSelector: didDismissSelector])
{
void (*didEnd)(id, SEL, id, NSInteger, void*);
didEnd = (void (*)(id, SEL, id, NSInteger, void*))[modalDelegate
methodForSelector: didEndSelector];
didEnd(modalDelegate, didEndSelector, panel, [panel result], contextInfo);
void (*didDismiss)(id, SEL, id, NSInteger, void*);
didDismiss = (void (*)(id, SEL, id, NSInteger, void*))[modalDelegate
methodForSelector: didDismissSelector];
didDismiss(modalDelegate, didDismissSelector, panel, [panel result],
contextInfo);
}
NSReleaseAlertPanel(panel);