From eea6b32f6677e671705adc5ad5ddb5ad768e875b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ana=C3=ABl=20Seghezzi?= <anael@maratis3d.com>
Date: Thu, 7 Mar 2019 14:51:12 +0100
Subject: [PATCH] Fix macOS 10.12 deprecated

---
 src/cocoa_window.m | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/cocoa_window.m b/src/cocoa_window.m
index 6887e4b7d..95a0330c1 100644
--- a/src/cocoa_window.m
+++ b/src/cocoa_window.m
@@ -45,6 +45,8 @@
  #define NSEventMaskAny NSAnyEventMask
  #define NSEventTypeApplicationDefined NSApplicationDefined
  #define NSBitmapFormatAlphaNonpremultiplied NSAlphaNonpremultipliedBitmapFormat
+ #define NSEventSubtypeTabletPoint NSTabletPointEventSubtype
+ #define NSEventSubtypeTabletProximity NSTabletProximityEventSubtype
 #endif
 
 // Returns the style mask corresponding to the window settings
@@ -465,7 +467,7 @@ static const NSRange kEmptyRange = { NSNotFound, 0 };
 {
     if ([window->ns.object isKeyWindow])
     {
-        if ([event subtype] == NSTabletPointEventSubtype)
+        if ([event subtype] == NSEventSubtypeTabletPoint)
         {
             const double pressure = [event pressure];
             const NSPoint tilt = [event tilt];
@@ -490,7 +492,7 @@ static const NSRange kEmptyRange = { NSNotFound, 0 };
 
             _glfwInputPenTabletData(
                 pos.x,
-                transformY(pos.y),
+                (double)transformY((float)pos.y),
                 posz / 1024.0,
                 pressure,
                 pitch,
@@ -498,7 +500,7 @@ static const NSRange kEmptyRange = { NSNotFound, 0 };
                 0.0);
         }
 
-        if ([event subtype] == NSTabletProximityEventSubtype)
+        if ([event subtype] == NSEventSubtypeTabletProximity)
         {
             static unsigned int s_cursor = 0;
             unsigned int cursor = [event pointingDeviceType];