diff options
| author | ZenWalker <[email protected]> | 2017-08-20 04:35:51 +0200 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2017-08-20 17:00:09 +0200 |
| commit | 0568785bbd484714a63caa4b9ca9639a2867d6e9 (patch) | |
| tree | ffcda2d32cb3b951a3e8d2c5c7e82204755e2cf7 /shell/ev-navigation-action-widget.c | |
| parent | 444cec08e38299e5d6ae9489ae74d02f4e4a5f97 (diff) | |
| download | atril-0568785bbd484714a63caa4b9ca9639a2867d6e9.tar.bz2 atril-0568785bbd484714a63caa4b9ca9639a2867d6e9.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
gdk_screen_get_monitor_at_point
Diffstat (limited to 'shell/ev-navigation-action-widget.c')
| -rw-r--r-- | shell/ev-navigation-action-widget.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/shell/ev-navigation-action-widget.c b/shell/ev-navigation-action-widget.c index de60674f..97bd0da5 100644 --- a/shell/ev-navigation-action-widget.c +++ b/shell/ev-navigation-action-widget.c @@ -131,18 +131,34 @@ menu_position_func (GtkMenu *menu, GtkTextDirection direction; GdkWindow *gdk_window; GdkRectangle monitor; +#if GTK_CHECK_VERSION (3, 22, 0) + GdkMonitor *monitor_num; + GdkDisplay *display; +#else gint monitor_num; GdkScreen *screen; +#endif gtk_widget_get_preferred_size (GTK_WIDGET (button->menu), &menu_req, NULL); direction = gtk_widget_get_direction (widget); +#if GTK_CHECK_VERSION (3, 22, 0) + display = gtk_widget_get_display (GTK_WIDGET (menu)); +#else screen = gtk_widget_get_screen (GTK_WIDGET (menu)); +#endif gdk_window = gtk_widget_get_window (widget); +#if GTK_CHECK_VERSION (3, 22, 0) + monitor_num = gdk_display_get_monitor_at_window (display, gdk_window); + if (monitor_num == NULL) + monitor_num = gdk_display_get_monitor (display, 0); + gdk_monitor_get_geometry (monitor_num, &monitor); +#else monitor_num = gdk_screen_get_monitor_at_window (screen, gdk_window); if (monitor_num < 0) monitor_num = 0; gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor); +#endif gdk_window_get_origin (gdk_window, x, y); gtk_widget_get_allocation (widget, &allocation); |