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

Minor changes.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@7588 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
humasect 2000-09-23 02:05:09 +00:00
parent f6b45986e5
commit fe7585edc2
4 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2000-09-22 Lyndon Tremblay <humasect@home.com>
* Source/NSBundleAdditions.m ([NSBundle +loadNibFile:externalNameTable:withZone:]):
access NSOwner from infoDict only when necessary, notify of loading nib.
* Model/GMAppKit.m: Removed silly emacs C++ mode tag.
* Model/IMLoading.m: Likewise.
2000-09-19 Richard Frith-Macdonald <rfm@gnu.org> 2000-09-19 Richard Frith-Macdonald <rfm@gnu.org>
* Source/GSTextStorage.m: ([-string]) fix to return autoreleased * Source/GSTextStorage.m: ([-string]) fix to return autoreleased

2
Model/GMAppKit.m
View file

@ -1,4 +1,4 @@
/* -*- C++ -*- /*
GMAppKit.m GMAppKit.m
Copyright (C) 1996 Free Software Foundation, Inc. Copyright (C) 1996 Free Software Foundation, Inc.

2
Model/IMLoading.m
View file

@ -1,4 +1,4 @@
/* -*- C++ -*- /*
IMLoading.m IMLoading.m
Copyright (C) 1996 Free Software Foundation, Inc. Copyright (C) 1996 Free Software Foundation, Inc.

8
Source/NSBundleAdditions.m
View file

@ -203,7 +203,6 @@
{ {
BOOL loaded = NO; BOOL loaded = NO;
NSUnarchiver *unarchiver = nil; NSUnarchiver *unarchiver = nil;
id owner = [context objectForKey: @"NSOwner"];
NSString *ext = [fileName pathExtension]; NSString *ext = [fileName pathExtension];
@ -212,9 +211,10 @@
if([ext isEqualToString: @"gmodel"]) if([ext isEqualToString: @"gmodel"])
{ {
return [GMModel loadIMFile: fileName return [GMModel loadIMFile: fileName
owner: owner]; owner: [context objectForKey: @"NSOwner"]];
} }
NSLog(@"Loading Nib `%@'...\n", fileName);
NS_DURING NS_DURING
{ {
NSData *data = [NSData dataWithContentsOfFile: fileName]; NSData *data = [NSData dataWithContentsOfFile: fileName];
@ -255,6 +255,10 @@
TEST_RELEASE(unarchiver); TEST_RELEASE(unarchiver);
} }
NS_ENDHANDLER NS_ENDHANDLER
if (!loaded)
NSLog(@"Failed to load Nib\n");
return loaded; return loaded;
} }