From bf05155c5e263a0bf93c0ae9615d5f829eb6f625 Mon Sep 17 00:00:00 2001 From: Antoine Mercadal Date: Thu, 12 Feb 2015 16:01:38 -0800 Subject: [PATCH] [FIXED] Merge issues MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit During a previous merge the call to ..willDisplayView:.. and …willRemoveView:.. for delegate methods were removed from CPTableView and CPOutlineView --- AppKit/CPTableView.j | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/AppKit/CPTableView.j b/AppKit/CPTableView.j index 431bc7513..db922aa75 100644 --- a/AppKit/CPTableView.j +++ b/AppKit/CPTableView.j @@ -3504,6 +3504,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad [self _resignEditedView]; var tableColumns = [_tableColumns objectsAtIndexes:columnIndexes]; + [self _enumerateViewsInRows:rowIndexes tableColumns:tableColumns usingBlock:function(dataView, row, tableColumn, stop) { var dataViewsForRows = _dataViewsForRows[row], @@ -3511,7 +3512,8 @@ Your delegate can implement this method to avoid subclassing the tableview to ad delete (dataViewsForRows[tableColumnUID]); - [self _enqueueReusableDataView:dataView]; + [self _sendDelegateWillRemoveView:dataView forTableColumn:tableColumn row:row]; + [self _enqueueReusableDataView:dataView]; }]; } @@ -3591,8 +3593,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad [self setNeedsDisplay:YES]; } - if (_implementedDelegateMethods & CPTableViewDelegate_tableView_willDisplayView_forTableColumn_row_) - [_delegate tableView:self willDisplayView:dataView forTableColumn:tableColumn row:row]; + [self _sendDelegateWillDisplayView:dataView forTableColumn:tableColumn row:row]; return dataView; }