mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-04-23 07:00:46 +00:00
Minor startup improvements etc.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@5683 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
9dabc31e25
commit
db5b4a9e70
3 changed files with 16 additions and 10 deletions
|
@ -1,4 +1,10 @@
|
|||
Fri Jan 7 18:37:00 2000 Richard Frith-Macdonald <richard@brainstorm.co.uk>
|
||||
Fri Jan 7 10:32:00 2000 Richard Frith-Macdonald <richard@brainstorm.co.uk>
|
||||
|
||||
* Source/Functions.m: NSApplicationMain() added suggestions from
|
||||
karl@nfox.com to destroy application before exit and log if the
|
||||
info file contains an invalid class.
|
||||
|
||||
Fri Jan 7 8:37:00 2000 Richard Frith-Macdonald <richard@brainstorm.co.uk>
|
||||
|
||||
* Source/NSApplication.m: ([-finishLoading]) add support for loading
|
||||
main nib.
|
||||
|
|
|
@ -41,11 +41,10 @@ char **NSArgv = NULL;
|
|||
int
|
||||
NSApplicationMain(int argc, const char **argv)
|
||||
{
|
||||
NSAutoreleasePool *pool;
|
||||
NSDictionary *infoDict;
|
||||
NSString *className;
|
||||
Class appClass;
|
||||
|
||||
CREATE_AUTORELEASE_POOL(pool);
|
||||
#if LIB_FOUNDATION_LIBRARY
|
||||
extern char **environ;
|
||||
|
||||
|
@ -54,8 +53,6 @@ NSApplicationMain(int argc, const char **argv)
|
|||
environment: environ];
|
||||
#endif
|
||||
|
||||
pool = [NSAutoreleasePool new];
|
||||
|
||||
#ifndef NX_CURRENT_COMPILER_RELEASE
|
||||
initialize_gnustep_backend();
|
||||
#endif
|
||||
|
@ -66,12 +63,15 @@ NSApplicationMain(int argc, const char **argv)
|
|||
|
||||
if (appClass == 0)
|
||||
{
|
||||
NSLog(@"Bad application class '%@' specified", className);
|
||||
appClass = [NSApplication class];
|
||||
}
|
||||
|
||||
[[appClass sharedApplication] run];
|
||||
|
||||
[pool release];
|
||||
DESTROY(NSApp);
|
||||
|
||||
RELEASE(pool);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -277,7 +277,7 @@ static NSCell* tileCell = nil;
|
|||
NSAppIconView *iv;
|
||||
|
||||
if (app_icon == nil)
|
||||
app_icon = [[NSImage imageNamed: @"GNUstep"] retain];
|
||||
app_icon = RETAIN([NSImage imageNamed: @"GNUstep"]);
|
||||
|
||||
_app_icon_window = [[NSIconWindow alloc] initWithContentRect:
|
||||
NSMakeRect(0,0,64,64)
|
||||
|
@ -562,9 +562,9 @@ static NSCell* tileCell = nil;
|
|||
{
|
||||
if ([NSBundle loadNibNamed: mainModelFile owner: self] == NO)
|
||||
{
|
||||
if (![GMModel loadIMFile: mainModelFile
|
||||
owner: [NSApplication sharedApplication]])
|
||||
NSLog (@"Cannot load the main model file '%@", mainModelFile);
|
||||
if ([GMModel loadIMFile: mainModelFile
|
||||
owner: self] == NO)
|
||||
NSLog (@"Cannot load the main model file '%@'", mainModelFile);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue