Fixes #1164. Support CPOutlineView `selectionShouldChangeInOutlineVie…

…w:` delegate method.
cappuccino · Mar 25, 2012 · f50802b · f50802b
1 parent 5351bf7
commit f50802b
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/AppKit/CPOutlineView.j b/AppKit/CPOutlineView.j
@@ -80,6 +80,8 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
     CPOutlineViewCoalesceSelectionNotificationStateOn   = 1,
     CPOutlineViewCoalesceSelectionNotificationStateDid  = 2;
 
+#define SELECTION_SHOULD_CHANGE(anOutlineView) (!((anOutlineView)._implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_selectionShouldChangeInOutlineView_) || [(anOutlineView)._outlineViewDelegate selectionShouldChangeInOutlineView:(anOutlineView)])
+
 #define SHOULD_SELECT_ITEM(anOutlineView, anItem) (!((anOutlineView)._implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_shouldSelectItem_) || [(anOutlineView)._outlineViewDelegate outlineView:(anOutlineView) shouldSelectItem:(anItem)])
 
 /*!
@@ -1512,7 +1514,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
             if (![self isItemExpanded:theItem])
             {
                 var parent = [self parentForItem:theItem],
-                    shouldSelect = parent && SHOULD_SELECT_ITEM(self, parent);
+                    shouldSelect = parent && SELECTION_SHOULD_CHANGE(self) && SHOULD_SELECT_ITEM(self, parent);
                 if (shouldSelect)
                 {
                     var rowIndex = [self rowForItem:parent];
@@ -1843,6 +1845,11 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
     return SHOULD_SELECT_ITEM(_outlineView, [_outlineView itemAtRow:theRow]);
 }
 
+- (BOOL)selectionShouldChangeInTableView:(CPTableView)theTableView
+{
+    return SELECTION_SHOULD_CHANGE(_outlineView);
+}
+
 - (BOOL)tableView:(CPTableView)aTableView shouldEditTableColumn:(CPTableColumn)aColumn row:(int)aRow
 {
     if ((_outlineView._implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_shouldEditTableColumn_item_))