[gtk/gtk-3-24] Prevent compile error for pressedMouseButtons when using SDK < 10.6.
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/gtk-3-24] Prevent compile error for pressedMouseButtons when using SDK < 10.6.
- Date: Sat, 22 Jun 2019 21:52:43 +0000 (UTC)
commit a26f6d97684f57ca33ae98c8088a1548a843c60e
Author: John Ralls <jralls ceridwen us>
Date: Fri Mar 15 12:35:57 2019 -0700
Prevent compile error for pressedMouseButtons when using SDK < 10.6.
Closes: https://gitlab.gnome.org/GNOME/gtk/issues/1687
gdk/quartz/gdkevents-quartz.c | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
---
diff --git a/gdk/quartz/gdkevents-quartz.c b/gdk/quartz/gdkevents-quartz.c
index 04ac6e1f5a..d525759a4f 100644
--- a/gdk/quartz/gdkevents-quartz.c
+++ b/gdk/quartz/gdkevents-quartz.c
@@ -41,6 +41,11 @@
#define GRIP_HEIGHT 15
#define GDK_LION_RESIZE 5
+#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060
+#define NSEventTypeRotate 13
+#define NSEventTypeMagnify 30
+#endif
+
#define WINDOW_IS_TOPLEVEL(window) \
(GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD && \
GDK_WINDOW_TYPE (window) != GDK_WINDOW_FOREIGN && \
@@ -1312,14 +1317,16 @@ _gdk_quartz_events_get_current_keyboard_modifiers (void)
GdkModifierType
_gdk_quartz_events_get_current_mouse_modifiers (void)
{
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
if (gdk_quartz_osx_version () >= GDK_OSX_SNOW_LEOPARD)
- {
- return get_mouse_button_modifiers_from_ns_buttons ([NSClassFromString(@"NSEvent")
pressedMouseButtons]);
- }
+ return get_mouse_button_modifiers_from_ns_buttons ([NSClassFromString(@"NSEvent") pressedMouseButtons]);
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
else
- {
- return get_mouse_button_modifiers_from_ns_buttons (GetCurrentButtonState ());
- }
+#endif
+#endif
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
+ return get_mouse_button_modifiers_from_ns_buttons (GetCurrentButtonState ());
+#endif
}
/* Detect window resizing */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]