Skip to content

W
wine-cw
Commit f9dc364b authored by Brendan Shanks's avatar Brendan Shanks Committed by Alexandre Julliard
Browse files
Options

winemac.drv: Fix warnings for constants deprecated by macOS 10.14.

Signed-off-by: 's avatarBrendan Shanks <bshanks@codeweavers.com> Signed-off-by: 's avatarKen Thomases <ken@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 737c54dc
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 5 deletions
dlls/winemac.drv/cocoa_clipboard.m
View file @ f9dc364b
...@@ -23,6 +23,14 @@ ...@@ -23,6 +23,14 @@
#import "cocoa_event.h" #import "cocoa_event.h"
#import "cocoa_window.h" #import "cocoa_window.h"
#if !defined(MAC_OS_X_VERSION_10_14) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_14
/* For older SDKs, #define the new names of constants deprecated/renamed in macOS 10.14. */
#define NSBitmapImageFileTypeBMP NSBMPFileType
#define NSBitmapImageFileTypeGIF NSGIFFileType
#define NSBitmapImageFileTypeJPEG NSJPEGFileType
#define NSBitmapImageFileTypePNG NSPNGFileType
#define NSBitmapImageFileTypeTIFF NSTIFFFileType
#endif
static int owned_change_count = -1; static int owned_change_count = -1;
static int change_count = -1; static int change_count = -1;
...@@ -86,11 +94,11 @@ CFArrayRef macdrv_copy_pasteboard_types(CFTypeRef pasteboard) ...@@ -86,11 +94,11 @@ CFArrayRef macdrv_copy_pasteboard_types(CFTypeRef pasteboard)
dispatch_once(&BitmapOutputTypesInitOnce, ^{ dispatch_once(&BitmapOutputTypesInitOnce, ^{
NSArray* bitmapFileTypes = [NSArray arrayWithObjects: NSArray* bitmapFileTypes = [NSArray arrayWithObjects:
[NSNumber numberWithUnsignedInteger:NSTIFFFileType], [NSNumber numberWithUnsignedInteger:NSBitmapImageFileTypeTIFF],
[NSNumber numberWithUnsignedInteger:NSPNGFileType], [NSNumber numberWithUnsignedInteger:NSBitmapImageFileTypePNG],
[NSNumber numberWithUnsignedInteger:NSBMPFileType], [NSNumber numberWithUnsignedInteger:NSBitmapImageFileTypeBMP],
[NSNumber numberWithUnsignedInteger:NSGIFFileType], [NSNumber numberWithUnsignedInteger:NSBitmapImageFileTypeGIF],
[NSNumber numberWithUnsignedInteger:NSJPEGFileType], [NSNumber numberWithUnsignedInteger:NSBitmapImageFileTypeJPEG],
nil]; nil];
BitmapOutputTypes = [[NSArray alloc] initWithObjects:@"public.tiff", @"public.png", BitmapOutputTypes = [[NSArray alloc] initWithObjects:@"public.tiff", @"public.png",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment