Commit b5725385 authored by Peter Maydell's avatar Peter Maydell
Browse files

ui/cocoa: Suppress NSFileHandlingPanelOKButton deprecation warning 



OSX 10.13 deprecates the NSFileHandlingPanelOKButton constant, and
would rather you use NSModalResponseOK, which was introduced in OS 10.9.
Use the recommended new constant name, with a backward compatibility
define if we're building on an older OSX.

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarJohn Arbuckle <programmingkidx@gmail.com>
Message-id: 20180529181523.19185-1-peter.maydell@linaro.org
parent e609fa71

ui/cocoa.m

+11 −1
Original line number Diff line number Diff line
@@ -44,6 +44,9 @@ 
#ifndef MAC_OS_X_VERSION_10_6

#define MAC_OS_X_VERSION_10_6 1060

#endif

#ifndef MAC_OS_X_VERSION_10_9

#define MAC_OS_X_VERSION_10_9 1090

#endif

#ifndef MAC_OS_X_VERSION_10_10

#define MAC_OS_X_VERSION_10_10 101000

#endif
@@ -79,6 +82,13 @@ 
#define NSWindowStyleMaskMiniaturizable NSMiniaturizableWindowMask

#define NSWindowStyleMaskTitled         NSTitledWindowMask

#endif

/* 10.13 deprecates NSFileHandlingPanelOKButton in favour of

 * NSModalResponseOK, which was introduced in 10.9. Define

 * it for older versions.

 */

#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_9

#define NSModalResponseOK NSFileHandlingPanelOKButton

#endif



//#define DEBUG
@@ -1218,7 +1228,7 @@ QemuCocoaView *cocoaView; 
    [openPanel setCanChooseFiles: YES];

    [openPanel setAllowsMultipleSelection: NO];

    [openPanel setAllowedFileTypes: supportedImageFileTypes];

    if([openPanel runModal] == NSFileHandlingPanelOKButton) {

    if([openPanel runModal] == NSModalResponseOK) {

        NSString * file = [[[openPanel URLs] objectAtIndex: 0] path];

        if(file == nil) {

            NSBeep();