From 66b533408d6a7a9e3f00138403ea88b9ddb4b303 Mon Sep 17 00:00:00 2001 From: Tom Schoonjans Date: Wed, 9 Jun 2021 16:35:31 +0100 Subject: [PATCH] quartz: fix compilation on macOS 10.10 --- gdk/quartz/gdkinternal-quartz.h | 6 +----- gdk/quartz/gdkwindow-quartz.c | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/gdk/quartz/gdkinternal-quartz.h b/gdk/quartz/gdkinternal-quartz.h index 271137171b..ec4a2c1c3b 100644 --- a/gdk/quartz/gdkinternal-quartz.h +++ b/gdk/quartz/gdkinternal-quartz.h @@ -79,14 +79,10 @@ typedef enum { #define GDK_QUARTZ_EVENT_TABLET_PROXIMITY NSEventTypeTabletProximity #define GDK_QUARTZ_EVENT_SUBTYPE_TABLET_PROXIMITY NSEventSubtypeTabletProximity #define GDK_QUARTZ_EVENT_SUBTYPE_TABLET_POINT NSEventSubtypeTabletPoint -#elif MAC_OS_X_VERSION_MIN_REQUIRED >= 10120 +#else #define GDK_QUARTZ_EVENT_TABLET_PROXIMITY NSTabletProximity #define GDK_QUARTZ_EVENT_SUBTYPE_TABLET_PROXIMITY NSTabletProximityEventSubtype #define GDK_QUARTZ_EVENT_SUBTYPE_TABLET_POINT NSTabletPointEventSubtype -#else -#define GDK_QUARTZ_EVENT_TABLET_PROXIMITY kEventTabletProximity -#define GDK_QUARTZ_EVENT_SUBTYPE_TABLET_PROXIMITY NSTabletProximityEventSubtype -#define GDK_QUARTZ_EVENT_SUBTYPE_TABLET_POINT kCGEventMouseSubtypeTabletPoint #endif void _gdk_quartz_events_update_focus_window (GdkWindow *new_window, diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c index 14711e7d8e..cb61aeb2f7 100644 --- a/gdk/quartz/gdkwindow-quartz.c +++ b/gdk/quartz/gdkwindow-quartz.c @@ -2228,7 +2228,7 @@ _gdk_quartz_window_set_collection_behavior (NSWindow *nswindow, GdkWindowTypeHint hint) { #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101100 +#if MAC_OS_X_VERSION_MIN_REQUIRED >= 101100 #define GDK_QUARTZ_ALLOWS_TILING NSWindowCollectionBehaviorFullScreenAllowsTiling #define GDK_QUARTZ_DISALLOWS_TILING NSWindowCollectionBehaviorFullScreenDisallowsTiling #else