From 15cc035cca02a59f684b53e573d3c067db778bb6 Mon Sep 17 00:00:00 2001 From: FredKiefer Date: Sun, 14 Sep 2003 00:33:05 +0000 Subject: [PATCH] According to Gregory John Casamento the popup button does not change its enable state when the selected item does. To adopt this behaviour all setEnable: calls have been removed and one in [initWithCoder:] added that enables the popup for all old encodings. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@17666 72102866-910b-0410-8b05-ffd578937521 --- Source/NSPopUpButtonCell.m | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Source/NSPopUpButtonCell.m b/Source/NSPopUpButtonCell.m index 73b14c411..97c80ddbe 100644 --- a/Source/NSPopUpButtonCell.m +++ b/Source/NSPopUpButtonCell.m @@ -102,7 +102,6 @@ static NSImage *_pbc_image[2]; if (item == _menuItem) { - [self setEnabled: [[self menuItem] isEnabled]]; [[self controlView] setNeedsDisplay: YES]; } } @@ -417,14 +416,13 @@ static NSImage *_pbc_image[2]; [_menuItem setImage: nil]; } - [super setMenuItem: item]; - + //[super setMenuItem: item]; + ASSIGN (_menuItem, item); + if ([_menuItem image] == nil) { [_menuItem setImage: image]; } - - [self setEnabled: [_menuItem isEnabled]]; } // Dealing with selection @@ -871,6 +869,7 @@ static NSImage *_pbc_image[2]; [anItem setOnStateImage: nil]; [anItem setMixedStateImage: nil]; } + [self setEnabled: YES]; } [self selectItem: selectedItem];