Changeset 14667


Ignore:
Timestamp:
Jan 8, 2016, 10:05:19 AM (6 years ago)
Author:
mikedld
Message:

Get rid of some more deprecation warnings (OS X)

Location:
trunk/macosx
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/macosx/Controller.m

    r14662 r14667  
    36443644       
    36453645        frame.origin = [fTableView convertPoint: frame.origin toView: nil];
    3646         frame.origin = [fWindow convertBaseToScreen: frame.origin];
     3646        frame = [fWindow convertRectToScreen: frame];
    36473647        frame.origin.y -= frame.size.height;
    36483648        return frame;
  • trunk/macosx/InfoFileViewController.m

    r13309 r14667  
    196196           
    197197            frame.origin = [fileOutlineView convertPoint: frame.origin toView: nil];
    198             frame.origin = [[[self view] window] convertBaseToScreen: frame.origin];
     198            frame = [[[self view] window] convertRectToScreen: frame];
    199199            frame.origin.y -= frame.size.height;
    200200            return frame;
  • trunk/macosx/InfoWindowController.m

    r13873 r14667  
    298298    NSRect windowRect = [window frame], viewRect = [view frame];
    299299   
    300     const CGFloat difference = (NSHeight(viewRect) - oldHeight) * [window userSpaceScaleFactor];
     300    const CGFloat difference = NSHeight(viewRect) - oldHeight;
    301301    windowRect.origin.y -= difference;
    302302    windowRect.size.height += difference;
     
    309309            if (NSHeight(windowRect) > screenHeight)
    310310            {
    311                 const CGFloat difference = (screenHeight - NSHeight(windowRect)) * [window userSpaceScaleFactor];
     311                const CGFloat difference = screenHeight - NSHeight(windowRect);
    312312                windowRect.origin.y -= difference;
    313313                windowRect.size.height += difference;
  • trunk/macosx/PrefsController.m

    r14662 r14667  
    14631463   
    14641464    NSRect windowRect = [window frame];
    1465     const CGFloat difference = (NSHeight([view frame]) - NSHeight([[window contentView] frame])) * [window userSpaceScaleFactor];
     1465    const CGFloat difference = NSHeight([view frame]) - NSHeight([[window contentView] frame]);
    14661466    windowRect.origin.y -= difference;
    14671467    windowRect.size.height += difference;
  • trunk/macosx/Torrent.m

    r14601 r14667  
    653653        return [NSImage imageNamed: @"Magnet"];
    654654   
    655     #warning replace kGenericFolderIcon stuff with NSImageNameFolder on 10.6
    656655    if (!fIcon)
    657         fIcon = [[[NSWorkspace sharedWorkspace] iconForFileType: [self isFolder] ? NSFileTypeForHFSTypeCode(kGenericFolderIcon)
    658                                                                                 : [[self name] pathExtension]] retain];
     656        fIcon = [self isFolder] ? [[NSImage imageNamed: NSImageNameFolder] retain]
     657                                : [[[NSWorkspace sharedWorkspace] iconForFileType: [[self name] pathExtension]] retain];
    659658    return fIcon;
    660659}
Note: See TracChangeset for help on using the changeset viewer.