gatuno
/
gatuno-terminal
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

gtk 3.22: avoid deprecated gdk_screen_get_monitor... functions: 

avoid deprecated:

gdk_screen_get_monitor_geometry
gdk_screen_get_monitor_at_window
master-1.22
ZenWalker 2017-08-24 17:10:26 +02:00
parent 5c6f10892a
commit e2d1efa329
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/terminal-window.c
View File

@ -574,8 +574,13 @@ position_menu_under_widget (GtkMenu *menu,
GtkRequisition req; GtkRequisition req;
GtkRequisition menu_req; GtkRequisition menu_req;
GdkRectangle monitor; GdkRectangle monitor;
#if GTK_CHECK_VERSION (3, 22, 0)
GdkMonitor *monitor_num;
GdkDisplay *display;
#else
int monitor_num; int monitor_num;
GdkScreen *screen; GdkScreen *screen;
#endif
GtkAllocation widget_allocation; GtkAllocation widget_allocation;
widget_window = gtk_widget_get_window (widget); 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 (widget, &req, NULL);
gtk_widget_get_preferred_size (GTK_WIDGET (menu), &menu_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)); screen = gtk_widget_get_screen (GTK_WIDGET (menu));
monitor_num = gdk_screen_get_monitor_at_window (screen, widget_window); monitor_num = gdk_screen_get_monitor_at_window (screen, widget_window);
if (monitor_num < 0) if (monitor_num < 0)
monitor_num = 0; monitor_num = 0;
gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor); gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor);
#endif
gdk_window_get_origin (widget_window, x, y); gdk_window_get_origin (widget_window, x, y);
if (!gtk_widget_get_has_window (widget)) if (!gtk_widget_get_has_window (widget))