From 89073268fd1a1a70de23deaa02af49453c497066 Mon Sep 17 00:00:00 2001 From: kgv Date: Tue, 15 Oct 2019 20:46:57 +0300 Subject: [PATCH] 0031021: Coding Rules - Deprecation warnings on OSX within Draw_Window_1.mm Use new renamed enumeration values instead of deprecated ones. --- src/Draw/Draw_Window_1.mm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/Draw/Draw_Window_1.mm b/src/Draw/Draw_Window_1.mm index d17b2cb16e..ce12c46d3b 100644 --- a/src/Draw/Draw_Window_1.mm +++ b/src/Draw/Draw_Window_1.mm @@ -36,6 +36,12 @@ #define NSCompositingOperationSourceOver NSCompositeSourceOver #endif +#if !defined(MAC_OS_X_VERSION_10_14) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_14) + #define NSBitmapImageFileTypePNG NSPNGFileType + #define NSBitmapImageFileTypeBMP NSBMPFileType + #define NSBitmapImageFileTypeJPEG NSJPEGFileType + #define NSBitmapImageFileTypeGIF NSGIFFileType +#endif @interface Draw_CocoaView : NSView { @@ -561,10 +567,10 @@ Standard_Boolean Draw_Window::Save (Standard_CString theFileName) const NSString* aFileExtension = [[aFileName pathExtension] lowercaseString]; NSDictionary* aFileTypeDict = [NSDictionary dictionaryWithObjectsAndKeys: - [NSNumber numberWithInt: NSPNGFileType], @"png", - [NSNumber numberWithInt: NSBMPFileType], @"bmp", - [NSNumber numberWithInt: NSJPEGFileType], @"jpg", - [NSNumber numberWithInt: NSGIFFileType], @"gif", + [NSNumber numberWithInt: NSBitmapImageFileTypePNG], @"png", + [NSNumber numberWithInt: NSBitmapImageFileTypeBMP], @"bmp", + [NSNumber numberWithInt: NSBitmapImageFileTypeJPEG], @"jpg", + [NSNumber numberWithInt: NSBitmapImageFileTypeGIF], @"gif", nil]; if ([aFileTypeDict valueForKey: aFileExtension] == NULL) { -- 2.39.5