From 7296ccf899864c304ee0042200b31979262ffa12 Mon Sep 17 00:00:00 2001 From: Doug Simons Date: Mon, 20 Apr 2015 20:56:05 +0000 Subject: [PATCH] fix NSPopUpButtonCell to ignore the altersStateOfSelectedItem setting as in Cocoa git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/branches/gnustep_testplant_branch@38460 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 5 +++++ Source/NSPopUpButtonCell.m | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a374403e4..5476b39dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-04-20 Doug Simons + + * Source/NSPopUpButtonCell.m: Ignore altersStateOfSelectedItem for + pullDown buttons as in Cocoa. + 2015-04-17 Doug Simons * Source/NSView.m: Fix broken invalidRect mechanism so, for diff --git a/Source/NSPopUpButtonCell.m b/Source/NSPopUpButtonCell.m index a85f51b45..42b6692fd 100644 --- a/Source/NSPopUpButtonCell.m +++ b/Source/NSPopUpButtonCell.m @@ -667,7 +667,7 @@ static NSImage *_pbc_image[5]; if (_selectedItem != nil) { - if (_pbcFlags.altersStateOfSelectedItem) + if (_pbcFlags.altersStateOfSelectedItem && !_pbcFlags.pullsDown) { [_selectedItem setState: NSOffState]; } @@ -684,7 +684,7 @@ static NSImage *_pbc_image[5]; if (_selectedItem != nil) { - if (_pbcFlags.altersStateOfSelectedItem) + if (_pbcFlags.altersStateOfSelectedItem && !_pbcFlags.pullsDown) { [_selectedItem setState: NSOnState]; }