Revert NSMenu changes from r27569.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@27624 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Wolfgang Lux 2009-01-18 14:55:57 +00:00
parent 42e2e73ebd
commit 6f61fe0106
2 changed files with 6 additions and 16 deletions

View file

@ -1,3 +1,8 @@
2009-01-18 Wolfgang Lux <wolfgang.lux@gmail.com>
* Source/NSMenu.m (-upate, -setAutoenablesItems:, initWithCoder):
Revert NSMenu changes from r27569.
2009-01-17 Wolfgang Lux <wolfgang.lux@gmail.com>
* Source/NSDocument.m (-windowForSheet): Return nil if the

View file

@ -933,7 +933,6 @@ static BOOL menuBarVisible = YES;
- (void) setAutoenablesItems: (BOOL)flag
{
_menu.autoenable = flag;
[self update];
}
- (BOOL) autoenablesItems
@ -1057,20 +1056,6 @@ static BOOL menuBarVisible = YES;
// Reenable displaying of menus
[self setMenuChangedMessagesEnabled: YES];
}
else
{
id<NSMenuItem> item = nil;
NSEnumerator *en = [_items objectEnumerator];
//
// If the menu items are not autoenabled, they should be enabled by default
// sincer we're not checking them.
//
while((item = [en nextObject]) != nil)
{
[item setEnabled: YES];
}
}
if (_menu.needsSizing && ([_aWindow isVisible] || [_bWindow isVisible]))
{
@ -1435,7 +1420,7 @@ static BOOL menuBarVisible = YES;
}
else
{
dAuto = YES; // if the no-autoenable flag isn't present, then autoenable.
dAuto = NO;
}
dTitle = [aDecoder decodeObjectForKey: @"NSTitle"];
dItems = [aDecoder decodeObjectForKey: @"NSMenuItems"];