diff options
| author | ZenWalker <[email protected]> | 2017-08-21 17:47:54 +0200 |
|---|---|---|
| committer | ZenWalker <[email protected]> | 2017-08-21 17:47:54 +0200 |
| commit | 0f6161518c8666bc931b2ae18ddb57b8aa0ac067 (patch) | |
| tree | d58003c3d49013128ddcf70a30eb9c908abd23e5 | |
| parent | b210e404823cb5b1fa5b74d700fa3f89c2ea71a2 (diff) | |
| download | mate-utils-0f6161518c8666bc931b2ae18ddb57b8aa0ac067.tar.bz2 mate-utils-0f6161518c8666bc931b2ae18ddb57b8aa0ac067.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
| -rw-r--r-- | mate-dictionary/src/gdict-applet.c | 12 | ||||
| -rw-r--r-- | mate-screenshot/src/screenshot-utils.c | 4 |
2 files changed, 16 insertions, 0 deletions
diff --git a/mate-dictionary/src/gdict-applet.c b/mate-dictionary/src/gdict-applet.c index 3d4100c2..6269c5b1 100644 --- a/mate-dictionary/src/gdict-applet.c +++ b/mate-dictionary/src/gdict-applet.c @@ -130,8 +130,13 @@ set_window_default_size (GdictApplet *applet) GtkWidget *widget, *defbox; gint width, height; gint font_size; +#if GTK_CHECK_VERSION (3, 22, 0) + GdkDisplay *display; + GdkMonitor *monitor_num; +#else GdkScreen *screen; gint monitor_num; +#endif GtkRequisition req; GdkRectangle monitor; @@ -154,11 +159,18 @@ set_window_default_size (GdictApplet *applet) height = MAX (height, req.height); /* ... but make it no larger than half the monitor size */ +#if GTK_CHECK_VERSION (3, 22, 0) + display = gtk_widget_get_display (widget); + monitor_num = gdk_display_get_monitor_at_window (display, + gtk_widget_get_window (widget)); + gdk_monitor_get_geometry (monitor_num, &monitor); +#else screen = gtk_widget_get_screen (widget); monitor_num = gdk_screen_get_monitor_at_window (screen, gtk_widget_get_window (widget)); gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor); +#endif width = MIN (width, monitor.width / 2); height = MIN (height, monitor.height / 2); diff --git a/mate-screenshot/src/screenshot-utils.c b/mate-screenshot/src/screenshot-utils.c index 55239a5c..8001b502 100644 --- a/mate-screenshot/src/screenshot-utils.c +++ b/mate-screenshot/src/screenshot-utils.c @@ -603,7 +603,11 @@ make_region_with_monitors (GdkScreen *screen) { GdkRectangle rect; +#if GTK_CHECK_VERSION (3, 22, 0) + gdk_monitor_get_geometry (gdk_display_get_monitor (display, i), &rect); +#else gdk_screen_get_monitor_geometry (screen, i, &rect); +#endif cairo_region_union_rectangle (region, &rect); } |