diff --git a/AppKit/CPTableHeaderView.j b/AppKit/CPTableHeaderView.j index e7dda0eb1..edcb3c610 100644 --- a/AppKit/CPTableHeaderView.j +++ b/AppKit/CPTableHeaderView.j @@ -160,21 +160,24 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal CPTableView _tableView @accessors(property=tableView); } -- (void)initWithFrame:(CGRect)aFrame +- (void)_init +{ + _resizedColumn = -1; + _draggedColumn = -1; + _pressedColumn = -1; + _draggedDistance = 0.0; + _lastLocation = nil; + _columnOldWidth = nil; + + [self setBackgroundColor:[CPColor colorWithPatternImage:CPAppKitImage("tableview-headerview.png", CGSizeMake(1.0, 22.0))]]; +} + +- (id)initWithFrame:(CGRect)aFrame { self = [super initWithFrame:aFrame]; if (self) - { - _resizedColumn = -1; - _draggedColumn = -1; - _pressedColumn = -1; - _draggedDistance = 0.0; - _lastLocation = nil; - _columnOldWidth = nil; - - [self setBackgroundColor:[CPColor colorWithPatternImage:CPAppKitImage("tableview-headerview.png", CGSizeMake(1.0, 22.0))]]; - } + [self _init]; return self; } @@ -481,12 +484,7 @@ var CPTableHeaderViewTableViewKey = @"CPTableHeaderViewTableViewKey"; { if (self = [super initWithCoder:aCoder]) { - _resizedColumn = -1; - _draggedColumn = -1; - _pressedColumn = -1; - _draggedDistance = 0.0; - _lastLocation = nil; - _columnOldWidth = nil; + [self _init]; _tableView = [aCoder decodeObjectForKey:CPTableHeaderViewTableViewKey]; } diff --git a/Tools/nib2cib/NSTableHeaderView.j b/Tools/nib2cib/NSTableHeaderView.j index c68d01607..9388cdcde 100644 --- a/Tools/nib2cib/NSTableHeaderView.j +++ b/Tools/nib2cib/NSTableHeaderView.j @@ -27,10 +27,7 @@ - (id)NS_initWithCoder:(CPCoder)aCoder { if (self = [super NS_initWithCoder:aCoder]) - { _tableView = [aCoder decodeObjectForKey:"NSTableView"]; - [self setBackgroundColor:[CPColor colorWithPatternImage:CPAppKitImage("tableview-headerview.png", CGSizeMake(1.0, 22.0))]]; - } return self; }