diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-04-16 20:02:09 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-04-16 20:02:09 +0000 |
| commit | 3a70781d40271bcdd5c1c7ab2302433bed655314 (patch) | |
| tree | aee834d2b7881c6c5548e7fbce0949b99ec4b7e2 | |
| parent | 399356833d184eb8577493b27e7bbeff79e6ace6 (diff) | |
| parent | 8627a9a569833ac814657034f49dd19ed6676d15 (diff) | |
| download | gtk+-3a70781d40271bcdd5c1c7ab2302433bed655314.tar.gz | |
Merge branch 'fix_elcapitan_support' into 'gtk-3-24'
Fix building on OS X El Capitan 10.11
See merge request GNOME/gtk!3402
| -rw-r--r-- | gdk/quartz/gdkinternal-quartz.h | 2 | ||||
| -rw-r--r-- | modules/input/imquartz.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gdk/quartz/gdkinternal-quartz.h b/gdk/quartz/gdkinternal-quartz.h index c546c18937..ec4a2c1c3b 100644 --- a/gdk/quartz/gdkinternal-quartz.h +++ b/gdk/quartz/gdkinternal-quartz.h @@ -75,7 +75,7 @@ typedef enum { GDK_QUARTZ_EVENT_SUBTYPE_EVENTLOOP } GdkQuartzEventSubType; -#if MAC_OS_X_VERSION_MIN_REQUIRED >= 10130 +#if MAC_OS_X_VERSION_MIN_REQUIRED >= 101300 #define GDK_QUARTZ_EVENT_TABLET_PROXIMITY NSEventTypeTabletProximity #define GDK_QUARTZ_EVENT_SUBTYPE_TABLET_PROXIMITY NSEventSubtypeTabletProximity #define GDK_QUARTZ_EVENT_SUBTYPE_TABLET_POINT NSEventSubtypeTabletPoint diff --git a/modules/input/imquartz.c b/modules/input/imquartz.c index aaf5f42acf..9b9b733841 100644 --- a/modules/input/imquartz.c +++ b/modules/input/imquartz.c @@ -37,7 +37,7 @@ #define GTK_IM_CONTEXT_QUARTZ(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_IM_CONTEXT_TYPE_QUARTZ, GtkIMContextQuartz)) #define GTK_IM_CONTEXT_QUARTZ_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_IM_CONTEXT_TYPE_QUARTZ, GtkIMContextQuartzClass)) -#if MAC_OS_X_VERSION_MIN_REQUIRED < 10120 +#if MAC_OS_X_VERSION_MIN_REQUIRED < 101200 #define NS_EVENT_KEY_DOWN NSKeyDown #else #define NS_EVENT_KEY_DOWN NSEventTypeKeyDown |