Skip to content

Commit

Permalink
* Source/GSTextFinder.m: Fix Ignore Case option to work.
Browse files Browse the repository at this point in the history
        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
  • Loading branch information
fredkiefer committed Aug 26, 2015
1 parent 1f3a02d commit 6c79a91
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 1 deletion.
8 changes: 8 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 2 additions & 0 deletions Source/GSTextFinder.m
Original file line number Diff line number Diff line change
Expand Up @@ -480,6 +480,8 @@ - (void) _updateFindStringFromPanel: (unsigned int *)options
if ([ignoreCaseButton state] != NSOffState)
{
*options |= NSCaseInsensitiveSearch;
// literal search is always case-sensitive, so it must be removed in this case
*options &= ~NSLiteralSearch;
}
else
{
Expand Down
1 change: 1 addition & 0 deletions Source/NSComboBoxCell.m
Original file line number Diff line number Diff line change
Expand Up @@ -1885,6 +1885,7 @@ - (void) _loadButtonCell
[_buttonCell setBordered: YES];
[_buttonCell setTarget: self];
[_buttonCell setAction: @selector(_didClickWithinButton:)];
[_buttonCell setEnabled: [self isEnabled]];
}

- (void) _selectCompleted
Expand Down
4 changes: 3 additions & 1 deletion Source/NSControl.m
Original file line number Diff line number Diff line change
Expand Up @@ -1026,7 +1026,9 @@ - (id) initWithCoder: (NSCoder*)aDecoder
}
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"])
{
Expand Down

0 comments on commit 6c79a91

Please sign in to comment.