Ignore:
Timestamp:
Jan 6, 2016, 11:05:37 AM (5 years ago)
Author:
mikedld
Message:

#6042: Remove dead code now that we build for OS X 10.7+ (patch by mattrajca)

In addition to the patch,

  • remove unused global actions menu (popover is used instead)
  • remove *Lion class macros, use NSPopover and NSDataDetector directly
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/macosx/FileOutlineController.m

    r13986 r14662  
    112112    if ((!text && !fFilterText) || (text && fFilterText && [text isEqualToString: fFilterText]))
    113113        return;
    114    
    115     const BOOL onLion = [NSApp isOnLionOrBetter];
    116    
    117     if (onLion)
    118         [fOutline beginUpdates];
     114
     115    [fOutline beginUpdates];
    119116   
    120117    NSUInteger currentIndex = 0, totalCount = 0;
     
    180177                }
    181178               
    182                 if (move && onLion)
     179                if (move)
    183180                    [fOutline moveItemAtIndex: previousIndex inParent: parent toIndex: currentIndex inParent: nil];
    184181               
     
    195192        const NSRange removeRange = NSMakeRange(currentIndex, [fFileList count]-currentIndex);
    196193        [fFileList removeObjectsInRange: removeRange];
    197         if (onLion)
    198             [fOutline removeItemsAtIndexes: [NSIndexSet indexSetWithIndexesInRange: removeRange] inParent: nil withAnimation: NSTableViewAnimationSlideDown];
     194        [fOutline removeItemsAtIndexes: [NSIndexSet indexSetWithIndexesInRange: removeRange] inParent: nil withAnimation: NSTableViewAnimationSlideDown];
    199195    }
    200196   
    201197    //add new items
    202198    [fFileList insertObjects: itemsToAdd atIndexes: itemsToAddIndexes];
    203     if (onLion)
    204         [fOutline insertItemsAtIndexes: itemsToAddIndexes inParent: nil withAnimation: NSTableViewAnimationSlideUp];
    205    
    206     if (onLion)
    207         [fOutline endUpdates];
    208     else
    209         [fOutline reloadData];
     199    [fOutline insertItemsAtIndexes: itemsToAddIndexes inParent: nil withAnimation: NSTableViewAnimationSlideUp];
     200
     201    [fOutline endUpdates];
    210202   
    211203    [fFilterText release];
Note: See TracChangeset for help on using the changeset viewer.