mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-05-30 13:10:38 +00:00
Readded NSCell setType: patch with originally missing bit for NSButtonCell.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@20072 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
878d6abeac
commit
a15214f38d
4 changed files with 45 additions and 8 deletions
|
@ -344,7 +344,10 @@ static NSColor *shadowCol;
|
|||
@"Attempt to use nil as string value");
|
||||
}
|
||||
|
||||
_cell.type = NSTextCellType;
|
||||
if (_cell.type != NSTextCellType)
|
||||
{
|
||||
[self setType: NSTextCellType];
|
||||
}
|
||||
_cell.contents_is_attributed_string = NO;
|
||||
|
||||
if (_formatter == nil)
|
||||
|
@ -739,13 +742,13 @@ static NSColor *shadowCol;
|
|||
|
||||
- (void) setFont: (NSFont*)fontObject
|
||||
{
|
||||
// This does not have any influence on attributed strings
|
||||
ASSIGN (_font, fontObject);
|
||||
|
||||
if (_cell.type != NSTextCellType)
|
||||
{
|
||||
_cell.type = NSTextCellType;
|
||||
[self setType: NSTextCellType];
|
||||
}
|
||||
|
||||
// This does not have any influence on attributed strings
|
||||
ASSIGN (_font, fontObject);
|
||||
}
|
||||
|
||||
- (void) setSelectable: (BOOL)flag
|
||||
|
@ -970,7 +973,10 @@ static NSColor *shadowCol;
|
|||
NSInvalidArgumentException);
|
||||
}
|
||||
|
||||
_cell.type = NSImageCellType;
|
||||
if (_cell.type != NSImageCellType)
|
||||
{
|
||||
[self setType: NSImageCellType];
|
||||
}
|
||||
|
||||
ASSIGN (_cell_image, anImage);
|
||||
}
|
||||
|
@ -2213,6 +2219,7 @@ static NSColor *shadowCol;
|
|||
|
||||
[anImage compositeToPoint: position operation: NSCompositeSourceOver];
|
||||
}
|
||||
|
||||
- (BOOL) _sendsActionOn:(int)eventTypeMask
|
||||
{
|
||||
return (_action_mask & eventTypeMask);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue