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

Improve nib support

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@5679 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2000-01-07 06:45:35 +00:00
parent c69a12abec
commit 0b37f2e6c6
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Fri Jan 7 18:37:00 2000 Richard Frith-Macdonald <richard@brainstorm.co.uk>
* Source/NSApplication.m: ([-finishLoading]) add support for loading
main nib.
Wed Jan 5 20:04:00 2000 Richard Frith-Macdonald <richard@brainstorm.co.uk>
* Source/NSMenuView.m: Changes to mouse tracking loop to provide more

12
Source/NSApplication.m
View file

@ -63,6 +63,7 @@
#include <AppKit/NSCursor.h>
#include <AppKit/NSWorkspace.h>
#include <AppKit/GSServicesManager.h>
#include <AppKit/NSNibLoading.h>
#include <AppKit/IMLoading.h>
#include <AppKit/DPSOperators.h>
@ -557,11 +558,14 @@ static NSCell* tileCell = nil;
BOOL hadDuplicates = NO;
mainModelFile = [infoDict objectForKey: @"NSMainNibFile"];
if (mainModelFile && ![mainModelFile isEqual: @""])
if (mainModelFile != nil && [mainModelFile isEqual: @""] == NO)
{
if (![GMModel loadIMFile: mainModelFile
owner: [NSApplication sharedApplication]])
NSLog (@"Cannot load the main model file '%@", mainModelFile);
if ([NSBundle loadNibNamed: mainModelFile owner: self] == NO)
{
if (![GMModel loadIMFile: mainModelFile
owner: [NSApplication sharedApplication]])
NSLog (@"Cannot load the main model file '%@", mainModelFile);
}
}
appIconFile = [infoDict objectForKey: @"NSIcon"];