gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-23 07:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Call generic methods properly from less generic ones.

Browse source
This commit is contained in:
Gregory John Casamento 2020-07-05 23:22:22 -04:00
parent b8b88a7579
commit 596ee3a0b6
1 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
Source/NSStoryboard.m
View file

@ -839,19 +839,25 @@ static NSStoryboard *__mainStoryboard = nil;
- (id) instantiateInitialController
{
return [self instantiateControllerWithIdentifier: _initialViewControllerId];
return [self instantiateInitialControllerWithCreator: nil];
}
- (id) instantiateInitialControllerWithCreator: (NSStoryboardControllerCreator)block
{
id controller = [self instantiateInitialController];
CALL_BLOCK(block, self);
return controller;
return [self instantiateControllerWithIdentifier: _initialViewControllerId
creator: block];
}
- (id) instantiateControllerWithIdentifier: (NSStoryboardSceneIdentifier)identifier
{
id result = nil;
return [self instantiateControllerWithIdentifier: identifier
creator: nil];
}
- (id) instantiateControllerWithIdentifier: (NSStoryboardSceneIdentifier)identifier
creator: (NSStoryboardControllerCreator)block
{
id result = nil;
NSMutableArray *topLevelObjects = [NSMutableArray arrayWithCapacity: 5];
NSDictionary *table = [NSDictionary dictionaryWithObjectsAndKeys: topLevelObjects,
NSNibTopLevelObjects,
@ -949,16 +955,13 @@ static NSStoryboard *__mainStoryboard = nil;
{
NSLog(@"Couldn't load controller scene id = %@", sceneId);
}
return result;
}
- (id) instantiateControllerWithIdentifier: (NSStoryboardSceneIdentifier)identifier
creator: (NSStoryboardControllerCreator)block
{
id controller = [self instantiateControllerWithIdentifier: identifier];
CALL_BLOCK(block, self);
return controller;
// Execute the block if it's set...
if (block != nil)
{
CALL_BLOCK(block, self);
}
return result;
}
@end