[gtk/gtk-3-24: 2/3] Remove platform specific code
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/gtk-3-24: 2/3] Remove platform specific code
- Date: Tue, 7 Jul 2020 15:20:55 +0000 (UTC)
commit 530f0c0300908083662623078d0e65baa55966fe
Author: Alynx Zhou <alynx zhou gmail com>
Date: Mon May 11 10:13:17 2020 +0800
Remove platform specific code
gtk/gtkmenu.c | 18 +-----------------
1 file changed, 1 insertion(+), 17 deletions(-)
---
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index a416e42ea2..eac972bb41 100644
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -140,9 +140,6 @@
#include "a11y/gtkmenuaccessible.h"
#include "gdk/gdk-private.h"
-#ifdef GDK_WINDOWING_X11
-#include "gdk/x11/gdkx.h"
-#endif
#define NAVIGATION_REGION_OVERSHOOT 50 /* How much the navigation region
* extends below the submenu
@@ -1778,28 +1775,15 @@ popup_grab_on_window (GdkWindow *window,
{
GdkGrabStatus status;
GdkSeat *seat;
-#ifdef GDK_WINDOWING_X11
- GdkDisplay *display;
-#endif
seat = gdk_device_get_seat (pointer);
-#ifdef GDK_WINDOWING_X11
- display = gdk_window_get_display (window);
-#endif
-#ifdef GDK_WINDOWING_X11
/* Let GtkMenu use pointer emulation instead of touch events under X11. */
#define GDK_SEAT_CAPABILITY_NO_TOUCH (GDK_SEAT_CAPABILITY_POINTER | \
GDK_SEAT_CAPABILITY_TABLET_STYLUS | \
GDK_SEAT_CAPABILITY_KEYBOARD)
- if (GDK_IS_X11_DISPLAY (display))
- status = gdk_seat_grab (seat, window,
- GDK_SEAT_CAPABILITY_NO_TOUCH, TRUE,
- NULL, NULL, NULL, NULL);
- else
-#endif
status = gdk_seat_grab (seat, window,
- GDK_SEAT_CAPABILITY_ALL, TRUE,
+ GDK_SEAT_CAPABILITY_NO_TOUCH, TRUE,
NULL, NULL, NULL, NULL);
return status == GDK_GRAB_SUCCESS;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]