Commit 2ba9de6e authored by Peter Maydell's avatar Peter Maydell Committed by Andreas Färber
Browse files

cocoa: Avoid deprecated NSOpenPanel beginSheetForDirectory 



In MacOSX 10.6 and above the NSOpenPanel beginSheetForDirectory
method is deprecated. Use the preferred replacements instead.
We retain the original code for use on earlier MacOSX versions
because the replacement methods don't exist before 10.6.

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarAndreas Färber <andreas.faerber@web.de>
parent 8bb3f1e3

ui/cocoa.m

+15 −1
Original line number Diff line number Diff line
@@ -35,6 +35,9 @@ 
#ifndef MAC_OS_X_VERSION_10_5

#define MAC_OS_X_VERSION_10_5 1050

#endif

#ifndef MAC_OS_X_VERSION_10_6

#define MAC_OS_X_VERSION_10_6 1060

#endif





//#define DEBUG
@@ -771,9 +774,20 @@ QemuCocoaView *cocoaView; 
        NSOpenPanel *op = [[NSOpenPanel alloc] init];

        [op setPrompt:@"Boot image"];

        [op setMessage:@"Select the disk image you want to boot.\n\nHit the \"Cancel\" button to quit"];

        [op beginSheetForDirectory:nil file:nil types:[NSArray arrayWithObjects:@"img",@"iso",@"dmg",@"qcow",@"cow",@"cloop",@"vmdk",nil]

        NSArray *filetypes = [NSArray arrayWithObjects:@"img", @"iso", @"dmg",

                                 @"qcow", @"cow", @"cloop", @"vmdk", nil];

#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6)

        [op setAllowedFileTypes:filetypes];

        [op beginSheetModalForWindow:normalWindow

            completionHandler:^(NSInteger returnCode)

            { [self openPanelDidEnd:op

                  returnCode:returnCode contextInfo:NULL ]; } ];

#else

        // Compatibility code for pre-10.6, using deprecated method

        [op beginSheetForDirectory:nil file:nil types:filetypes

              modalForWindow:normalWindow modalDelegate:self

              didEndSelector:@selector(openPanelDidEnd:returnCode:contextInfo:) contextInfo:NULL];

#endif

    } else {

        // or launch QEMU, with the global args

        [self startEmulationWithArgc:gArgc argv:(char **)gArgv];