RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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.
This commit is contained in:
Akemi 2018-01-20 15:40:18 +01:00 committed by Kevin Mitchell
parent dba143de4d
commit 45ce4ba877
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osdep/macosx_compat.h
View File

@ -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 */

2
osdep/macosx_menubar.m
View File

@ -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]];