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

Fix for loading where the files owner is in a library, framework or bundle,

Browse source 
but the Gorm/NIB file is in the application resources.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@22887 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2006-05-10 13:06:57 +00:00
parent 9b560ad650
commit c97b446ffd
2 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
2006-05-10 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSBundleAdditions.m: ([loadNibNamed:owner:]) if the NIB can't
be found in the owners bundle, try the main bundle of the application.
Fixes loading where the files owner is in a library, framework or
bundle, but the Gorm/NIB file is in the application resources.
I'm not sure this is the correct order, perhaps we should try the
main bundle first and the library/framework only if the rersource
is not in the main bundle.
2006-05-06 Fred Kiefer <FredKiefer@gmx.de> 2006-05-06 Fred Kiefer <FredKiefer@gmx.de>
* Resources/Esperanto.lproj/Localizable.string, * Resources/Esperanto.lproj/Localizable.string,

8
Source/NSBundleAdditions.m
View file

@ -344,7 +344,13 @@ Class gmodel_class(void)
} }
table = [NSDictionary dictionaryWithObject: owner forKey: @"NSOwner"]; table = [NSDictionary dictionaryWithObject: owner forKey: @"NSOwner"];
bundle = [self bundleForClass: [owner class]]; bundle = [self bundleForClass: [owner class]];
if (bundle == nil) if (bundle != nil && [bundle loadNibFile: aNibName
externalNameTable: table
withZone: [owner zone]] == YES)
{
return YES;
}
else
{ {
bundle = [self mainBundle]; bundle = [self mainBundle];
} }