[Libreoffice-commits] core.git: vcl/osx

[Douglas Mencken]

 vcl/osx/salinst.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit f711b333cfa24f3c7134f799b39a634ca1a0a885
Author: Douglas Mencken <dougmencken at gmail.com>
Date:   Wed Jul 2 05:40:09 2014 -0400

    fix 'NSImage' may not respond to '-lockFocusFlipped:'
    
    related commit: b3818f53812053e94196a58bbe474e2c3b72ac69
    
    Change-Id: Ica27b3c2e474ebb85a69149e35021835f8183b69
    Reviewed-on: https://gerrit.libreoffice.org/10011
    Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>
    Tested-by: Norbert Thiebaud <nthiebaud at gmail.com>

diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index 9e9b35c..3104733 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -1049,8 +1049,12 @@ NSImage* CreateNSImage( const Image& rImage )
     NSImage* pImage = [[NSImage alloc] initWithSize: NSMakeSize( aSize.Width(), aSize.Height() )];
     if( pImage )
     {
+#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060
+        [pImage setFlipped:YES];
+        [pImage lockFocus];
+#else
         [pImage lockFocusFlipped:YES];
-
+#endif
         NSGraphicsContext* pContext = [NSGraphicsContext currentContext];
         CGContextRef rCGContext = reinterpret_cast<CGContextRef>([pContext graphicsPort]);