Author: fredkiefer
Date: Wed Aug 26 23:10:12 2015
New Revision: 38933
URL: http://svn.gna.org/viewcvs/gnustep?rev=38933&view=rev
Log:
* Source/GSTextFinder.m: Fix Ignore Case option to work.
Patch by Doug Simons <[email protected]>
* Source/NSControl.m (-initWithCoder:): Don't use NSEnabled flag
as it is wrong for NSComboBox.
* Source/NSComboBoxCell.m (_loadButtonCell): Set enabled on
button cell.
Modified:
libs/gui/trunk/ChangeLog
libs/gui/trunk/Source/GSTextFinder.m
libs/gui/trunk/Source/NSComboBoxCell.m
libs/gui/trunk/Source/NSControl.m
Modified: libs/gui/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/ChangeLog?rev=38933&r1=38932&r2=38933&view=diff
==============================================================================
--- libs/gui/trunk/ChangeLog (original)
+++ libs/gui/trunk/ChangeLog Wed Aug 26 23:10:12 2015
@@ -1,3 +1,11 @@
+2015-08-26 Fred Kiefer <[email protected]>
+
+ * Source/GSTextFinder.m: Fix Ignore Case option to work.
+ Patch by Doug Simons <[email protected]>
+ * 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 <[email protected]>
* Tests/gui/NSView/NSView_autoresize_and_rounding.m: Add tests for
Modified: libs/gui/trunk/Source/GSTextFinder.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Source/GSTextFinder.m?rev=38933&r1=38932&r2=38933&view=diff
==============================================================================
--- libs/gui/trunk/Source/GSTextFinder.m (original)
+++ libs/gui/trunk/Source/GSTextFinder.m Wed Aug 26 23:10:12 2015
@@ -480,6 +480,8 @@
if ([ignoreCaseButton state] != NSOffState)
{
*options |= NSCaseInsensitiveSearch;
+ // literal search is always case-sensitive, so it must be removed in
this case
+ *options &= ~NSLiteralSearch;
}
else
{
Modified: libs/gui/trunk/Source/NSComboBoxCell.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Source/NSComboBoxCell.m?rev=38933&r1=38932&r2=38933&view=diff
==============================================================================
--- libs/gui/trunk/Source/NSComboBoxCell.m (original)
+++ libs/gui/trunk/Source/NSComboBoxCell.m Wed Aug 26 23:10:12 2015
@@ -1885,6 +1885,7 @@
[_buttonCell setBordered: YES];
[_buttonCell setTarget: self];
[_buttonCell setAction: @selector(_didClickWithinButton:)];
+ [_buttonCell setEnabled: [self isEnabled]];
}
- (void) _selectCompleted
Modified: libs/gui/trunk/Source/NSControl.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Source/NSControl.m?rev=38933&r1=38932&r2=38933&view=diff
==============================================================================
--- libs/gui/trunk/Source/NSControl.m (original)
+++ libs/gui/trunk/Source/NSControl.m Wed Aug 26 23:10:12 2015
@@ -1026,7 +1026,9 @@
}
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"])
{
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
