mirror of
https://github.com/gnustep/apps-gorm.git
synced 2025-04-22 22:20:44 +00:00
* GormCore/GormDocument.m: Simplify message in
fileRepresentationOfType:. * GormCore/GormNibWrapperBuilder.m: Correct test for menu which was causing the app to crash in openItems method. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@23299 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
6aba750c3b
commit
32c3144b50
3 changed files with 16 additions and 5 deletions
|
@ -1,3 +1,10 @@
|
|||
2006-08-16 00:54-EDT Gregory John Casamento <greg_casamento@yahoo.com>
|
||||
|
||||
* GormCore/GormDocument.m: Simplify message in
|
||||
fileRepresentationOfType:.
|
||||
* GormCore/GormNibWrapperBuilder.m: Correct test for menu which
|
||||
was causing the app to crash in openItems method.
|
||||
|
||||
2006-08-15 17:50-EDT Gregory John Casamento <greg_casamento@yahoo.com>
|
||||
|
||||
* GormCore/GormWrapperLoader.m: Correct problem introduced in
|
||||
|
|
|
@ -3287,8 +3287,8 @@ static NSImage *fileImage = nil;
|
|||
{
|
||||
int retval = NSRunAlertPanel(_(@"Compatibility Warning"),
|
||||
_(@"Saving will update this gorm to the latest version,\n"
|
||||
@"which is not compatible with GNUstep's gui 0.9.5 (or earlier) Release\n"
|
||||
@"or CVS prior to June 2 2005."),
|
||||
@"which may not be compatible with some previous versions, \n"
|
||||
@"of GNUstep."),
|
||||
_(@"Save"),
|
||||
_(@"Don't Save"), nil, nil);
|
||||
if (retval != NSAlertDefaultReturn)
|
||||
|
|
|
@ -274,9 +274,9 @@
|
|||
{
|
||||
NSMapTable *oids = [_container oids];
|
||||
NSMutableArray *openItems = [NSMutableArray array];
|
||||
NSNumber *menuOid = NSMapGet(oids,[document objectForName: @"NSMenu"]);
|
||||
id obj = nil;
|
||||
NSEnumerator *en = [[_container visibleWindows] objectEnumerator];
|
||||
id menu = [document objectForName: @"NSMenu"];
|
||||
id obj = nil;
|
||||
|
||||
// Get the open items, so that IB displays the same windows that Gorm had open when it
|
||||
// saved....
|
||||
|
@ -290,7 +290,11 @@
|
|||
}
|
||||
|
||||
// add the menu...
|
||||
[openItems addObject: menuOid];
|
||||
if(menu != nil)
|
||||
{
|
||||
NSNumber *menuOid = NSMapGet(oids,menu);
|
||||
[openItems addObject: menuOid];
|
||||
}
|
||||
|
||||
return openItems;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue