OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-04 18:06:22 +03:00
Code Packages Releases Activity

0029156: Coding Rules - eliminate deprecation compiler warnings when targeting macOS 10.12

Browse Source
This commit is contained in:
kgv 2017-09-28 23:48:55 +03:00
parent b1c235dfce
commit e2b4dea253
4 changed files with 49 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Cocoa/Cocoa_Window.mm
View File

@ -34,6 +34,14 @@ IMPLEMENT_STANDARD_RTTIEXT(Cocoa_Window,Aspect_Window)
#if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE #if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
// //
#else #else
#if !defined(MAC_OS_X_VERSION_10_12) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12)
// replacements for macOS versions before 10.12
#define NSWindowStyleMaskResizable NSResizableWindowMask
#define NSWindowStyleMaskClosable NSClosableWindowMask
#define NSWindowStyleMaskTitled NSTitledWindowMask
#endif
static Standard_Integer getScreenBottom() static Standard_Integer getScreenBottom()
{ {
Cocoa_LocalPool aLocalPool; Cocoa_LocalPool aLocalPool;
@ -95,7 +103,7 @@ Cocoa_Window::Cocoa_Window (const Standard_CString theTitle,
myYBottom = myYTop + thePxHeight; myYBottom = myYTop + thePxHeight;
Cocoa_LocalPool aLocalPool; Cocoa_LocalPool aLocalPool;
NSUInteger aWinStyle = NSTitledWindowMask | NSClosableWindowMask | NSResizableWindowMask; NSUInteger aWinStyle = NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | NSWindowStyleMaskResizable;
NSRect aRectNs = NSMakeRect (float(myXLeft), float(myYTop), float(thePxWidth), float(thePxHeight)); NSRect aRectNs = NSMakeRect (float(myXLeft), float(myYTop), float(thePxWidth), float(thePxHeight));
myHWindow = [[NSWindow alloc] initWithContentRect: aRectNs myHWindow = [[NSWindow alloc] initWithContentRect: aRectNs
styleMask: aWinStyle styleMask: aWinStyle

33
src/Draw/Draw_Window_1.mm
View File

@ -18,6 +18,25 @@
#include <Draw_Window.hxx> #include <Draw_Window.hxx>
#include <Cocoa_LocalPool.hxx> #include <Cocoa_LocalPool.hxx>
#if !defined(MAC_OS_X_VERSION_10_12) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12)
// replacements for macOS versions before 10.12
#define NSEventTypeLeftMouseDown NSLeftMouseDown
#define NSEventTypeRightMouseDown NSRightMouseDown
#define NSEventTypeLeftMouseDragged NSLeftMouseDragged
#define NSEventTypeMouseMoved NSMouseMoved
#define NSEventMaskLeftMouseDragged NSLeftMouseDraggedMask
#define NSEventMaskMouseMoved NSMouseMovedMask
#define NSEventMaskLeftMouseDown NSLeftMouseDownMask
#define NSEventMaskRightMouseDown NSRightMouseDownMask
#define NSWindowStyleMaskResizable NSResizableWindowMask
#define NSWindowStyleMaskClosable NSClosableWindowMask
#define NSWindowStyleMaskTitled NSTitledWindowMask
#define NSCompositingOperationSourceOver NSCompositeSourceOver
#endif
@interface Draw_CocoaView : NSView @interface Draw_CocoaView : NSView
{ {
NSImage* myImage; NSImage* myImage;
@ -53,7 +72,7 @@
[myImage drawInRect: aBounds [myImage drawInRect: aBounds
fromRect: NSZeroRect fromRect: NSZeroRect
operation: NSCompositeSourceOver operation: NSCompositingOperationSourceOver
fraction: 1 fraction: 1
respectFlipped: YES respectFlipped: YES
hints: nil]; hints: nil];
@ -199,7 +218,7 @@ void Draw_Window::Init (const Standard_Integer& theXLeft, const Standard_Integer
if (myWindow == NULL) if (myWindow == NULL)
{ {
NSRect aRectNs = NSMakeRect (theXLeft, anYTop, theWidth, theHeight); NSRect aRectNs = NSMakeRect (theXLeft, anYTop, theWidth, theHeight);
NSUInteger aWinStyle = NSTitledWindowMask | NSClosableWindowMask | NSResizableWindowMask; NSUInteger aWinStyle = NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | NSWindowStyleMaskResizable;
myWindow = [[NSWindow alloc] initWithContentRect: aRectNs myWindow = [[NSWindow alloc] initWithContentRect: aRectNs
styleMask: aWinStyle styleMask: aWinStyle
@ -580,11 +599,11 @@ void GetNextEvent (Standard_Boolean theWait,
{ {
Cocoa_LocalPool aLocalPool; Cocoa_LocalPool aLocalPool;
unsigned int anEventMatchMask = NSLeftMouseDownMask | NSRightMouseDownMask; unsigned int anEventMatchMask = NSEventMaskLeftMouseDown | NSEventMaskRightMouseDown;
if (!theWait) if (!theWait)
{ {
anEventMatchMask = anEventMatchMask | NSMouseMovedMask | NSLeftMouseDraggedMask; anEventMatchMask = anEventMatchMask | NSEventMaskMouseMoved | NSEventMaskLeftMouseDragged;
Draw_IsInZoomingMode = Standard_True; Draw_IsInZoomingMode = Standard_True;
} }
@ -604,15 +623,15 @@ void GetNextEvent (Standard_Boolean theWait,
NSEventType anEventType = [anEvent type]; NSEventType anEventType = [anEvent type];
if (anEventType == NSLeftMouseDown) if (anEventType == NSEventTypeLeftMouseDown)
{ {
theButton = 1; theButton = 1;
} }
else if (anEventType == NSRightMouseDown) else if (anEventType == NSEventTypeRightMouseDown)
{ {
theButton = 3; theButton = 3;
} }
else if ((anEventType == NSMouseMoved || anEventType == NSLeftMouseDragged) && !theWait) else if ((anEventType == NSEventTypeMouseMoved || anEventType == NSEventTypeLeftMouseDragged) && !theWait)
{ {
theButton = 0; theButton = 0;
} }

4
src/OpenGl/OpenGl_Window_1.mm
View File

@ -162,7 +162,11 @@ OpenGl_Window::OpenGl_Window (const Handle(OpenGl_GraphicDriver)& theDriver,
{ {
continue; continue;
} }
// deprecated since macOS 10.12 without replacement
Standard_DISABLE_DEPRECATION_WARNINGS
anAttribs[aLastAttrib++] = NSOpenGLPFAStereo; anAttribs[aLastAttrib++] = NSOpenGLPFAStereo;
Standard_ENABLE_DEPRECATION_WARNINGS
} }
anAttribs[aLastAttrib] = 0; anAttribs[aLastAttrib] = 0;

14
src/ViewerTest/ViewerTest_ViewerCommands_1.mm
View File

@ -23,6 +23,12 @@
#include <TCollection_AsciiString.hxx> #include <TCollection_AsciiString.hxx>
#include <NCollection_DoubleMap.hxx> #include <NCollection_DoubleMap.hxx>
#if !defined(MAC_OS_X_VERSION_10_12) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12)
// replacements for macOS versions before 10.12
#define NSEventModifierFlagControl NSControlKeyMask
#define NSEventModifierFlagShift NSShiftKeyMask
#endif
//! Custom Cocoa view to handle events //! Custom Cocoa view to handle events
@interface ViewerTest_CocoaEventManagerView : NSView @interface ViewerTest_CocoaEventManagerView : NSView
@end @end
@ -227,7 +233,7 @@ static void getMouseCoords (NSView* theView,
- (void )mouseDown: (NSEvent* )theEvent - (void )mouseDown: (NSEvent* )theEvent
{ {
getMouseCoords (self, theEvent, X_ButtonPress, Y_ButtonPress); getMouseCoords (self, theEvent, X_ButtonPress, Y_ButtonPress);
VT_ProcessButton1Press (0, NULL, Standard_False, [theEvent modifierFlags] & NSShiftKeyMask); VT_ProcessButton1Press (0, NULL, Standard_False, [theEvent modifierFlags] & NSEventModifierFlagShift);
} }
// ======================================================================= // =======================================================================
@ -237,7 +243,7 @@ static void getMouseCoords (NSView* theView,
- (void )mouseUp: (NSEvent* )theEvent - (void )mouseUp: (NSEvent* )theEvent
{ {
getMouseCoords (self, theEvent, X_Motion, Y_Motion); getMouseCoords (self, theEvent, X_Motion, Y_Motion);
VT_ProcessButton1Release([theEvent modifierFlags] & NSShiftKeyMask); VT_ProcessButton1Release([theEvent modifierFlags] & NSEventModifierFlagShift);
} }
@ -248,7 +254,7 @@ static void getMouseCoords (NSView* theView,
- (void )mouseDragged: (NSEvent* )theEvent - (void )mouseDragged: (NSEvent* )theEvent
{ {
IsDragged = Standard_True; IsDragged = Standard_True;
if ([theEvent modifierFlags] & NSControlKeyMask) if ([theEvent modifierFlags] & NSEventModifierFlagControl)
{ {
getMouseCoords (self, theEvent, X_Motion, Y_Motion); getMouseCoords (self, theEvent, X_Motion, Y_Motion);
VT_ProcessControlButton2Motion(); VT_ProcessControlButton2Motion();
@ -281,7 +287,7 @@ static void getMouseCoords (NSView* theView,
// ======================================================================= // =======================================================================
- (void )rightMouseDragged: (NSEvent* )theEvent - (void )rightMouseDragged: (NSEvent* )theEvent
{ {
if ([theEvent modifierFlags] & NSControlKeyMask) if ([theEvent modifierFlags] & NSEventModifierFlagControl)
{ {
getMouseCoords (self, theEvent, X_Motion, Y_Motion); getMouseCoords (self, theEvent, X_Motion, Y_Motion);
VT_ProcessControlButton3Motion(); VT_ProcessControlButton3Motion();