diff --git a/AppKit/CPTableColumn.j b/AppKit/CPTableColumn.j index 647122576..f098b4eaa 100644 --- a/AppKit/CPTableColumn.j +++ b/AppKit/CPTableColumn.j @@ -27,21 +27,10 @@ @import "CPTableHeaderView.j" +#include "CoreGraphics/CGGeometry.h" -/* - @global - @class CPTableColumn -*/ CPTableColumnNoResizing = 0; -/* - @global - @class CPTableColumn -*/ CPTableColumnAutoresizingMask = 1; -/* - @global - @class CPTableColumn -*/ CPTableColumnUserResizingMask = 2; @implementation CPTableColumn : CPObject @@ -54,6 +43,7 @@ CPTableColumnUserResizingMask = 2; float _width; float _minWidth; float _maxWidth; + unsigned _resizingMask; id _identifier; BOOL _isEditable; diff --git a/AppKit/CPTableView.j b/AppKit/CPTableView.j index 110efabbb..93806cd8b 100644 --- a/AppKit/CPTableView.j +++ b/AppKit/CPTableView.j @@ -241,9 +241,12 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5; _selectedColumnIndexes = [CPIndexSet indexSet]; _selectedRowIndexes = [CPIndexSet indexSet]; -window.setTimeout(function(){ - self._draggedRowIndexes = [CPIndexSet indexSet]; - self._verticalMotionCanDrag = YES;}, 0); + _draggedRowIndexes = [CPIndexSet indexSet]; + _verticalMotionCanDrag = YES; + _isSelectingSession = NO; + _retargetedDropRow = nil; + _retargetedDropOperation = nil; + _dragOperationDefaultMask = nil; _destinationDragStyle = CPTableViewDraggingDestinationFeedbackStyleRegular; _dropOperationFeedbackView = [[_dropOperationDrawingView alloc] initWithFrame:_CGRectMakeZero()]; [self addSubview:_dropOperationFeedbackView];