diff options
| author | Akemi <der.richter@gmx.de> | 2018-01-20 15:40:18 +0100 |
|---|---|---|
| committer | Kevin Mitchell <kevmitch@gmail.com> | 2018-01-20 14:43:49 -0800 |
| commit | 45ce4ba877b965291d9d9209b6dda6fbfbf83bb7 (patch) | |
| tree | 0a8537e636568b6628a9e2a12d0004c871cb2854 | |
| parent | dba143de4db8b33c28e817d67c95afa870cf5651 (diff) | |
| download | mpv-45ce4ba877b965291d9d9209b6dda6fbfbf83bb7.tar.bz2 mpv-45ce4ba877b965291d9d9209b6dda6fbfbf83bb7.tar.xz | |
osx: fix macOS 10.13 deprecation warning
NSFileHandlingPanelOKButton is deprecated with macOS 10.13, but the
replacement NSModalResponseOK is not available on 10.8 and earlier.
added a declaration for 10.8 and earlier since i only officially
dropped support for 10.7 and earlier. this is untested.
| -rw-r--r-- | osdep/macosx_compat.h | 6 | ||||
| -rw-r--r-- | osdep/macosx_menubar.m | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/osdep/macosx_compat.h b/osdep/macosx_compat.h index 0c2e87d14c..747aa159af 100644 --- a/osdep/macosx_compat.h +++ b/osdep/macosx_compat.h @@ -52,6 +52,12 @@ static const NSEventModifierFlags NSEventModifierFlagShift = NSShiftKeyMask; static const NSEventModifierFlags NSEventModifierFlagControl = NSControlKeyMask; static const NSEventModifierFlags NSEventModifierFlagCommand = NSCommandKeyMask; static const NSEventModifierFlags NSEventModifierFlagOption = NSAlternateKeyMask; + +#if (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_9) +typedef NSUInteger NSModalResponse; +static const NSModalResponse NSModalResponseOK = NSFileHandlingPanelOKButton +#endif + #endif #endif /* MPV_MACOSX_COMPAT */ diff --git a/osdep/macosx_menubar.m b/osdep/macosx_menubar.m index 3a5c5a76c2..8081ed202e 100644 --- a/osdep/macosx_menubar.m +++ b/osdep/macosx_menubar.m @@ -660,7 +660,7 @@ [panel setCanChooseDirectories:YES]; [panel setAllowsMultipleSelection:YES]; - if ([panel runModal] == NSFileHandlingPanelOKButton){ + if ([panel runModal] == NSModalResponseOK){ NSMutableArray *fileArray = [[NSMutableArray alloc] init]; for (id url in [panel URLs]) [fileArray addObject:[url path]]; |