OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-09 13:22:24 +03:00
Code 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
Download Patch File Download Diff File Expand all files Collapse all files

14
src/ViewerTest/ViewerTest_ViewerCommands_1.mm
View File

@@ -23,6 +23,12 @@
#include <TCollection_AsciiString.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
@interface ViewerTest_CocoaEventManagerView : NSView
@end
@@ -227,7 +233,7 @@ static void getMouseCoords (NSView* theView,
- (void )mouseDown: (NSEvent* )theEvent
{
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
{
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
{
IsDragged = Standard_True;
if ([theEvent modifierFlags] & NSControlKeyMask)
if ([theEvent modifierFlags] & NSEventModifierFlagControl)
{
getMouseCoords (self, theEvent, X_Motion, Y_Motion);
VT_ProcessControlButton2Motion();
@@ -281,7 +287,7 @@ static void getMouseCoords (NSView* theView,
// =======================================================================
- (void )rightMouseDragged: (NSEvent* )theEvent
{
if ([theEvent modifierFlags] & NSControlKeyMask)
if ([theEvent modifierFlags] & NSEventModifierFlagControl)
{
getMouseCoords (self, theEvent, X_Motion, Y_Motion);
VT_ProcessControlButton3Motion();