Module: wine Branch: master Commit: 682820d3cb5abf8fc1b0d98a3f9f9d1e4ed16fc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=682820d3cb5abf8fc1b0d98a3f...
Author: Ken Thomases ken@codeweavers.com Date: Tue Nov 10 02:29:18 2015 -0600
winemac: Fix a crash on versions of OS X prior to 10.9 which don't have the -[NSImage drawInRect:] method.
[image drawInRect:rect] is documented as being "exactly equivalent to calling [image drawInRect:rect fromRect:NSZeroRect operation:NSCompositeSourceOver fraction:1 respectFlipped:YES hints:nil]". So, that's what I replace it with.
Signed-off-by: Ken Thomases ken@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/winemac.drv/cocoa_window.m | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 15fa16f..75f5605 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1841,7 +1841,12 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi }
CGContextDrawImage(cgcontext, rect, windowImage); - [appImage drawInRect:NSMakeRect(156, 4, 96, 96)]; + [appImage drawInRect:NSMakeRect(156, 4, 96, 96) + fromRect:NSZeroRect + operation:NSCompositeSourceOver + fraction:1 + respectFlipped:YES + hints:nil];
[dockIcon unlockFocus];