Changes for bug33395: Adds missing setter implementation. Changes to follow for behavioral and archival changes.

This commit is contained in:
Gregory John Casamento 2019-03-09 09:47:23 -05:00
parent e833084f6d
commit 4406c7de45
2 changed files with 14 additions and 4 deletions

View file

@ -203,7 +203,7 @@ enum {
// Set while the cell is edited/selected
unsigned in_editing: 1;
// Set if cell uses single line mode.
unsigned _uses_single_line_mode:1;
unsigned uses_single_line_mode:1;
} _cell;
NSUInteger _mouse_down_flags;
NSUInteger _action_mask;

View file

@ -103,7 +103,7 @@ static NSColor *dtxtCol;
{
if (self == [NSCell class])
{
[self setVersion: 3];
[self setVersion: 4];
colorClass = [NSColor class];
cellClass = [NSCell class];
fontClass = [NSFont class];
@ -2251,6 +2251,7 @@ static NSColor *dtxtCol;
{
BOOL needsClipView;
BOOL wraps = [self wraps];
BOOL usesSingleLineMode = [self usesSingleLineMode];
NSTextContainer *ct;
NSSize maxSize;
NSRect titleRect = [self titleRectForBounds: aRect];
@ -2571,6 +2572,8 @@ static NSColor *dtxtCol;
[aCoder encodeValueOfObjCType: @encode(unsigned int) at: &tmp_int];
tmp_int = _cell.base_writing_direction;
[aCoder encodeValueOfObjCType: @encode(unsigned int) at: &tmp_int];
tmp_int = _cell.uses_single_line_mode;
[aCoder encodeValueOfObjCType: @encode(unsigned int) at: &tmp_int];
}
}
@ -2854,6 +2857,13 @@ static NSColor *dtxtCol;
wraps attribute. */
[self setWraps: wraps];
}
if (version >= 3)
{
[aDecoder decodeValueOfObjCType: @encode(unsigned int) at: &tmp_int];
_cell.uses_single_line_mode = tmp_int;
}
}
return self;
}
@ -2872,12 +2882,12 @@ static NSColor *dtxtCol;
- (void) setUsesSingleLineMode: (BOOL)flag
{
_cell._uses_single_line_mode = flag;
_cell.uses_single_line_mode = flag;
}
- (BOOL) usesSingleLineMode
{
return _cell._uses_single_line_mode;
return _cell.uses_single_line_mode;
}
@end