diff options
author | monsta <[email protected]> | 2018-01-31 09:46:08 +0300 |
---|---|---|
committer | monsta <[email protected]> | 2018-01-31 09:46:08 +0300 |
commit | ab7987701bcea97e4326fecd161c3137080f6077 (patch) | |
tree | 3e49c11405cc69fab4b8a10ba4342cf70078d22a /mate-panel/menu.c | |
parent | f553591e0562fd7b4bba0fe6a6182bc0b3747a34 (diff) | |
download | mate-panel-ab7987701bcea97e4326fecd161c3137080f6077.tar.bz2 mate-panel-ab7987701bcea97e4326fecd161c3137080f6077.tar.xz |
require GTK+ 3.22 and GLib 2.50
Diffstat (limited to 'mate-panel/menu.c')
-rw-r--r-- | mate-panel/menu.c | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/mate-panel/menu.c b/mate-panel/menu.c index 6b2858f1..43695bb8 100644 --- a/mate-panel/menu.c +++ b/mate-panel/menu.c @@ -424,44 +424,15 @@ grab_widget (GtkWidget *widget) GdkWindow *window; GdkDisplay *display; -#if GTK_CHECK_VERSION (3, 20, 0) GdkSeat *seat; -#else - GdkDeviceManager *device_manager; - GdkDevice *pointer; - GdkDevice *keyboard; -#endif window = gtk_widget_get_window (widget); display = gdk_window_get_display (window); -#if GTK_CHECK_VERSION (3, 20, 0) seat = gdk_display_get_default_seat (display); gdk_seat_grab (seat, window, GDK_SEAT_CAPABILITY_ALL, TRUE, NULL, NULL, NULL, NULL); -#else - device_manager = gdk_display_get_device_manager (display); - pointer = gdk_device_manager_get_client_pointer (device_manager); - keyboard = gdk_device_get_associated_device (pointer); - - if (gdk_device_grab (pointer, window, - GDK_OWNERSHIP_WINDOW, TRUE, - GDK_SMOOTH_SCROLL_MASK | - GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | - GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | - GDK_POINTER_MOTION_MASK, - NULL, GDK_CURRENT_TIME) != GDK_GRAB_SUCCESS) { - return; - } - - if (gdk_device_grab (keyboard, window, - GDK_OWNERSHIP_WINDOW, TRUE, - GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK, - NULL, GDK_CURRENT_TIME) != GDK_GRAB_SUCCESS) { - gdk_device_ungrab (pointer, GDK_CURRENT_TIME); - } -#endif } static void @@ -779,12 +750,8 @@ setup_menuitem (GtkWidget *menuitem, gtk_accel_label_set_accel_widget (GTK_ACCEL_LABEL (label), menuitem); -#if GTK_CHECK_VERSION (3, 16, 0) gtk_label_set_xalign (GTK_LABEL (label), 0.0); gtk_label_set_yalign (GTK_LABEL (label), 0.5); -#else - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); -#endif gtk_widget_show (label); gtk_container_add (GTK_CONTAINER (menuitem), label); |