callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevent compile error for pressedMouseButtons when using SDK < 10.6.

Browse Source 
Closes: https://gitlab.gnome.org/GNOME/gtk/issues/1687
This commit is contained in:
John Ralls
2019-03-15 12:35:57 -07:00
parent 13e64aa103
commit a26f6d9768
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
gdk/quartz/gdkevents-quartz.c
View File

@ -41,6 +41,11 @@
#define GRIP_HEIGHT 15 #define GRIP_HEIGHT 15
#define GDK_LION_RESIZE 5 #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) \ #define WINDOW_IS_TOPLEVEL(window) \
(GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD && \ (GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD && \
GDK_WINDOW_TYPE (window) != GDK_WINDOW_FOREIGN && \ GDK_WINDOW_TYPE (window) != GDK_WINDOW_FOREIGN && \
@ -1312,14 +1317,16 @@ _gdk_quartz_events_get_current_keyboard_modifiers (void)
GdkModifierType GdkModifierType
_gdk_quartz_events_get_current_mouse_modifiers (void) _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) 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 else
{ #endif
return get_mouse_button_modifiers_from_ns_buttons (GetCurrentButtonState ()); #endif
} #if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
return get_mouse_button_modifiers_from_ns_buttons (GetCurrentButtonState ());
#endif
} }
/* Detect window resizing */ /* Detect window resizing */