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

Corrections suggested by Fred

Browse source
This commit is contained in:
Gregory John Casamento 2020-07-05 20:42:35 -04:00
parent 6ddb3b0233
commit 93fe3a260c
3 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Source/Functions.m
View file

@ -114,7 +114,7 @@ NSApplicationMain(int argc, const char **argv)
}
else
{
NSLog(_(@"Could not find model to load %@"), mainModelFile);
NSLog(_(@"Storyboard is blank or nil, unable to load."));
}
}

2
Source/GSXib5KeyedUnarchiver.h
View file

@ -28,8 +28,6 @@
#import <Foundation/Foundation.h>
#import "GNUstepGUI/GSXibKeyedUnarchiver.h"
#import "GNUstepGUI/GSNibLoading.h"
#import "GNUstepGUI/GSXibLoading.h"
@class GSXibElement;

17
Source/NSStoryboard.m
View file

@ -1,5 +1,5 @@
/* Implementation of class NSStoryboard
Copyright (C) 2019 Free Software Foundation, Inc.
Copyright (C) 2020 Free Software Foundation, Inc.
By: Gregory Casamento
Date: Mon Jan 20 15:57:37 EST 2020
@ -276,11 +276,11 @@ static NSStoryboard *__mainStoryboard = nil;
@interface NSControllerPlaceholder : NSObject <NSCoding, NSCopying> // , NSSeguePerforming>
{
NSString *_storyboardName;
NSStoryboard *_storyboard;
}
- (NSString *) storyboardName;
- (void) setStoryboardName: (NSString *)name;
- (id) instantiate;
@end
@ -292,7 +292,6 @@ static NSStoryboard *__mainStoryboard = nil;
self = [super init];
if (self != nil)
{
_storyboardName = nil;
}
return self;
}
@ -334,9 +333,9 @@ static NSStoryboard *__mainStoryboard = nil;
- (id) instantiate
{
_storyboard = [NSStoryboard storyboardWithName: _storyboardName
bundle: [NSBundle mainBundle]];
return [_storyboard instantiateInitialController];
NSStoryboard *sb = [NSStoryboard storyboardWithName: _storyboardName
bundle: [NSBundle mainBundle]];
return [sb instantiateInitialController];
}
@end
@ -386,7 +385,8 @@ static NSStoryboard *__mainStoryboard = nil;
_controllerMap = [[NSMutableDictionary alloc] initWithCapacity: [array count]];
_documentsMap = [[NSMutableDictionary alloc] initWithCapacity: [array count]];
while ((e = [en nextObject]) != nil)
//while ((e = [en nextObject]) != nil)
FOR_IN(NSXMLElement*, e, array)
{
NSXMLElement *doc = [[NSXMLElement alloc] initWithName: @"document"];
NSArray *children = [e children];
@ -404,7 +404,7 @@ static NSStoryboard *__mainStoryboard = nil;
NSArray *subnodes = [child nodesForXPath: @"//application" error: NULL];
NSXMLNode *appNode = [subnodes objectAtIndex: 0];
if ([[appNode name] isEqualToString: @"application"] == YES)
if (appNode != nil)
{
NSXMLElement *objects = (NSXMLElement *)[appNode parent];
NSArray *appConsArr = [appNode nodesForXPath: @"connections" error: NULL];
@ -609,6 +609,7 @@ static NSStoryboard *__mainStoryboard = nil;
RELEASE(document);
}
}
END_FOR_IN(array);
}
else
{