mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-06-02 12:30:59 +00:00
Updated for change in NSCell ivar plus tiny optms
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@5693 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
a465ac2e06
commit
ae1eeade06
1 changed files with 6 additions and 4 deletions
|
@ -66,14 +66,16 @@
|
||||||
//
|
//
|
||||||
- (id) _init
|
- (id) _init
|
||||||
{
|
{
|
||||||
_cell.is_enabled = YES;
|
// Implicitly performed by allocation:
|
||||||
_buttoncell_is_transparent = NO;
|
//
|
||||||
|
//_buttoncell_is_transparent = NO;
|
||||||
|
//_altContents = nil;
|
||||||
|
|
||||||
_cell.is_bordered = YES;
|
_cell.is_bordered = YES;
|
||||||
_showAltStateMask = NSNoCellMask; // configure as a NSMomentaryPushButton
|
_showAltStateMask = NSNoCellMask; // configure as a NSMomentaryPushButton
|
||||||
_highlightsByMask = NSPushInCellMask | NSChangeGrayCellMask;
|
_highlightsByMask = NSPushInCellMask | NSChangeGrayCellMask;
|
||||||
_delayInterval = 0.4;
|
_delayInterval = 0.4;
|
||||||
_repeatInterval = 0.075;
|
_repeatInterval = 0.075;
|
||||||
_altContents = nil;
|
|
||||||
_keyEquivalentModifierMask = NSCommandKeyMask;
|
_keyEquivalentModifierMask = NSCommandKeyMask;
|
||||||
|
|
||||||
return self;
|
return self;
|
||||||
|
@ -356,7 +358,7 @@
|
||||||
//
|
//
|
||||||
- (NSColor *) textColor
|
- (NSColor *) textColor
|
||||||
{
|
{
|
||||||
if (_cell.is_enabled == NO)
|
if (_cell.is_disabled == YES)
|
||||||
return [NSColor disabledControlTextColor];
|
return [NSColor disabledControlTextColor];
|
||||||
if ((_cell.state && (_showAltStateMask & NSChangeGrayCellMask))
|
if ((_cell.state && (_showAltStateMask & NSChangeGrayCellMask))
|
||||||
|| (_cell.is_highlighted && (_highlightsByMask & NSChangeGrayCellMask)))
|
|| (_cell.is_highlighted && (_highlightsByMask & NSChangeGrayCellMask)))
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue