More fixes for interface testing.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@19426 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Gregory John Casamento 2004-05-30 03:02:05 +00:00
parent 3a6b0cfd40
commit 069acfa974
2 changed files with 22 additions and 7 deletions

View file

@ -1,4 +1,12 @@
2004-05-29 08:56 Gregory John Casamento <greg_casamento@yahoo.com>
2004-05-29 23:10 Gregory John Casamento <greg_casamento@yahoo.com>
* Gorm.m: [Gorm testInterface:] removed conditional. The services
menu is always set to nil when testing. [Gorm endTesting:] added
a NS_DURING block to catch any issues with resetting the services menu.
This prevents Gorm from crashing, if there's a problem. Since the
menu is set to nil and then reset there shouldn't be an issue.
2004-05-29 16:00 Gregory John Casamento <greg_casamento@yahoo.com>
* GormDocument.m: [GormDocument attachObject:] added code
to automatically mark a menu being attached as the

19
Gorm.m
View file

@ -757,11 +757,8 @@ NSString *GormResizeCellNotification = @"GormResizeCellNotification";
}
}
// save the services menu...
if([self servicesMenu] == servicesMenu)
{
[self setServicesMenu: nil]; // so we don't get the warning...
}
// so we don't get the warning...
[self setServicesMenu: nil];
// display the current main menu...
[[self mainMenu] display];
@ -1037,7 +1034,17 @@ NSString *GormResizeCellNotification = @"GormResizeCellNotification";
}
[self setMainMenu: mainMenu];
[self setServicesMenu: servicesMenu];
NS_DURING
{
[self setServicesMenu: servicesMenu];
}
NS_HANDLER
{
NSDebugLog(@"Exception while setting services menu");
}
NS_ENDHANDLER
[mainMenu display]; // bring it to the front...
isTesting = NO;