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

33
src/Draw/Draw_Window_1.mm
View File

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