summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorZenWalker <[email protected]>2017-08-24 17:10:26 +0200
committerZenWalker <[email protected]>2017-08-24 17:10:26 +0200
commite2d1efa329eea0c26000d728ae96d2a376b929f9 (patch)
tree2fc2e6631495cefa03f69bfd8b22439f57711bf7 /src
parent5c6f10892aed32bf7c450962119f65c470898d6d (diff)
downloadmate-terminal-e2d1efa329eea0c26000d728ae96d2a376b929f9.tar.bz2
mate-terminal-e2d1efa329eea0c26000d728ae96d2a376b929f9.tar.xz
gtk 3.22: avoid deprecated gdk_screen_get_monitor... functions:
avoid deprecated: gdk_screen_get_monitor_geometry gdk_screen_get_monitor_at_window
Diffstat (limited to 'src')
-rw-r--r--src/terminal-window.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/terminal-window.c b/src/terminal-window.c
index 292eea8..ce3b437 100644
--- a/src/terminal-window.c
+++ b/src/terminal-window.c
@@ -574,8 +574,13 @@ position_menu_under_widget (GtkMenu *menu,
GtkRequisition req;
GtkRequisition menu_req;
GdkRectangle monitor;
+#if GTK_CHECK_VERSION (3, 22, 0)
+ GdkMonitor *monitor_num;
+ GdkDisplay *display;
+#else
int monitor_num;
GdkScreen *screen;
+#endif
GtkAllocation widget_allocation;
widget_window = gtk_widget_get_window (widget);
@@ -585,11 +590,19 @@ position_menu_under_widget (GtkMenu *menu,
gtk_widget_get_preferred_size (widget, &req, NULL);
gtk_widget_get_preferred_size (GTK_WIDGET (menu), &menu_req, NULL);
+#if GTK_CHECK_VERSION (3, 22, 0)
+ display = gtk_widget_get_display (GTK_WIDGET (menu));
+ monitor_num = gdk_display_get_monitor_at_window (display, widget_window);
+ if (monitor_num == NULL)
+ monitor_num = gdk_display_get_monitor (display, 0);
+ gdk_monitor_get_geometry (monitor_num, &monitor);
+#else
screen = gtk_widget_get_screen (GTK_WIDGET (menu));
monitor_num = gdk_screen_get_monitor_at_window (screen, widget_window);
if (monitor_num < 0)
monitor_num = 0;
gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor);
+#endif
gdk_window_get_origin (widget_window, x, y);
if (!gtk_widget_get_has_window (widget))