* Source/GSTextFinder.m: Fix Ignore Case option to work.

Patch by Doug Simons <doug.simons@testplant.com>
        * Source/NSControl.m (-initWithCoder:): Don't use NSEnabled flag
        as it is wrong for NSComboBox.
        * Source/NSComboBoxCell.m (_loadButtonCell): Set enabled on
        button cell.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@38933 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2015-08-26 21:10:12 +00:00
parent 59fa666263
commit f65931aa6c
4 changed files with 14 additions and 1 deletions

View file

@ -1,3 +1,11 @@
2015-08-26 Fred Kiefer <FredKiefer@gmx.de>
* Source/GSTextFinder.m: Fix Ignore Case option to work.
Patch by Doug Simons <doug.simons@testplant.com>
* Source/NSControl.m (-initWithCoder:): Don't use NSEnabled flag
as it is wrong for NSComboBox.
* Source/NSComboBoxCell.m (_loadButtonCell): Set enabled on button cell.
2015-08-25 Fred Kiefer <FredKiefer@gmx.de>
* Tests/gui/NSView/NSView_autoresize_and_rounding.m: Add tests for

View file

@ -480,6 +480,8 @@ static GSTextFinder *sharedTextFinder;
if ([ignoreCaseButton state] != NSOffState)
{
*options |= NSCaseInsensitiveSearch;
// literal search is always case-sensitive, so it must be removed in this case
*options &= ~NSLiteralSearch;
}
else
{

View file

@ -1885,6 +1885,7 @@ static inline NSRect buttonCellFrameFromRect(NSRect cellRect)
[_buttonCell setBordered: YES];
[_buttonCell setTarget: self];
[_buttonCell setAction: @selector(_didClickWithinButton:)];
[_buttonCell setEnabled: [self isEnabled]];
}
- (void) _selectCompleted

View file

@ -1026,7 +1026,9 @@ static NSNotificationCenter *nc;
}
if ([aDecoder containsValueForKey: @"NSEnabled"])
{
[self setEnabled: [aDecoder decodeBoolForKey: @"NSEnabled"]];
// Don't use this information as it also comes from the cell
// and NSComboBox has always YES here, even when disabled
//[self setEnabled: [aDecoder decodeBoolForKey: @"NSEnabled"]];
}
if ([aDecoder containsValueForKey: @"NSTag"])
{