summaryrefslogtreecommitdiff
path: root/src/core/display.c
diff options
context:
space:
mode:
authormonsta <[email protected]>2016-10-15 15:39:12 +0300
committermonsta <[email protected]>2016-10-15 15:39:12 +0300
commit40e26ed6d0e9ef84522ad0723f630bd7d796beec (patch)
tree67374984e9b7d2c60525976a008889775f7de4f3 /src/core/display.c
parent3b69fd200912e27ce64caf3bf5d4338aab73177b (diff)
downloadmarco-40e26ed6d0e9ef84522ad0723f630bd7d796beec.tar.bz2
marco-40e26ed6d0e9ef84522ad0723f630bd7d796beec.tar.xz
move to GTK+3 (>= 3.14), drop GTK+2 code and --with-gtk build option
Diffstat (limited to 'src/core/display.c')
-rw-r--r--src/core/display.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/src/core/display.c b/src/core/display.c
index caa76247..7b3ec502 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -1471,23 +1471,15 @@ static gboolean maybe_send_event_to_gtk(MetaDisplay* display, XEvent* xevent)
* (client-side) subwindow for individual menu items.
*/
-#if GTK_CHECK_VERSION (3, 0, 0)
GdkDeviceManager *device_manager = gdk_display_get_device_manager (gdk_display);
GdkDevice *device = gdk_device_manager_get_client_pointer (device_manager);
if (gdk_display_device_is_grabbed(gdk_display, device))
-#else
- if (gdk_display_pointer_is_grabbed(gdk_display))
-#endif
{
return FALSE;
}
-#if GTK_CHECK_VERSION (3, 0, 0)
if (gdk_display_device_is_grabbed(gdk_display, device))
-#else
- if (gdk_display_pointer_is_grabbed(gdk_display))
-#endif
{
return FALSE;
}
@@ -1586,9 +1578,8 @@ static gboolean maybe_send_event_to_gtk(MetaDisplay* display, XEvent* xevent)
g_assert_not_reached();
break;
}
-#if GTK_CHECK_VERSION (3, 0, 0)
+
gdk_event_set_device (gdk_event, device);
-#endif
/* If we've gotten here, we've filled in the gdk_event and should send it on */
gtk_main_do_event(gdk_event);