mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

Get rid of some more deprecation warnings (OS X)

This commit is contained in:
Mike Gelfand 2016-01-08 10:05:19 +00:00
parent 13a98a02b8
commit 2ca7ac7473
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
macosx/Controller.m
View File

@ -3643,7 +3643,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
return NSZeroRect;
frame.origin = [fTableView convertPoint: frame.origin toView: nil];
frame.origin = [fWindow convertBaseToScreen: frame.origin];
frame = [fWindow convertRectToScreen: frame];
frame.origin.y -= frame.size.height;
return frame;
}

2
macosx/InfoFileViewController.m
View File

@ -195,7 +195,7 @@
return NSZeroRect;
frame.origin = [fileOutlineView convertPoint: frame.origin toView: nil];
frame.origin = [[[self view] window] convertBaseToScreen: frame.origin];
frame = [[[self view] window] convertRectToScreen: frame];
frame.origin.y -= frame.size.height;
return frame;
}

4
macosx/InfoWindowController.m
View File

@ -297,7 +297,7 @@ typedef enum
NSRect windowRect = [window frame], viewRect = [view frame];
const CGFloat difference = (NSHeight(viewRect) - oldHeight) * [window userSpaceScaleFactor];
const CGFloat difference = NSHeight(viewRect) - oldHeight;
windowRect.origin.y -= difference;
windowRect.size.height += difference;
@ -308,7 +308,7 @@ typedef enum
const CGFloat screenHeight = NSHeight([[window screen] visibleFrame]);
if (NSHeight(windowRect) > screenHeight)
{
const CGFloat difference = (screenHeight - NSHeight(windowRect)) * [window userSpaceScaleFactor];
const CGFloat difference = screenHeight - NSHeight(windowRect);
windowRect.origin.y -= difference;
windowRect.size.height += difference;

2
macosx/PrefsController.m
View File

@ -1462,7 +1462,7 @@
return;
NSRect windowRect = [window frame];
const CGFloat difference = (NSHeight([view frame]) - NSHeight([[window contentView] frame])) * [window userSpaceScaleFactor];
const CGFloat difference = NSHeight([view frame]) - NSHeight([[window contentView] frame]);
windowRect.origin.y -= difference;
windowRect.size.height += difference;

5
macosx/Torrent.m
View File

@ -652,10 +652,9 @@ bool trashDataFile(const char * filename, tr_error ** error)
if ([self isMagnet])
return [NSImage imageNamed: @"Magnet"];
#warning replace kGenericFolderIcon stuff with NSImageNameFolder on 10.6
if (!fIcon)
fIcon = [[[NSWorkspace sharedWorkspace] iconForFileType: [self isFolder] ? NSFileTypeForHFSTypeCode(kGenericFolderIcon)
: [[self name] pathExtension]] retain];
fIcon = [self isFolder] ? [[NSImage imageNamed: NSImageNameFolder] retain]
: [[[NSWorkspace sharedWorkspace] iconForFileType: [[self name] pathExtension]] retain];
return fIcon;
}