From 7730fad0990fea927c0017bca6855de45bdd4915 Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Sun, 7 Jan 2018 16:30:38 +0100 Subject: Switch sp-namedview.cpp to use the convenience function --- src/sp-namedview.cpp | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/src/sp-namedview.cpp b/src/sp-namedview.cpp index a61cf22e1..6fb6e4bfc 100644 --- a/src/sp-namedview.cpp +++ b/src/sp-namedview.cpp @@ -28,6 +28,7 @@ #include "document-undo.h" #include "desktop-events.h" #include "enums.h" +#include "ui/monitor.h" #include "sp-guide.h" #include "sp-item-group.h" @@ -38,12 +39,6 @@ #include "sp-root.h" #include -#if GTKMM_CHECK_VERSION(3,22,0) -# include -#else -# include -#endif - using Inkscape::DocumentUndo; using Inkscape::Util::unit_table; @@ -759,16 +754,7 @@ void sp_namedview_window_from_document(SPDesktop *desktop) (new_document && (default_size == PREFS_WINDOW_SIZE_MAXIMIZED))) { win->maximize(); } else { - Gdk::Rectangle monitor_geometry; -#if GTKMM_CHECK_VERSION(3,22,0) - auto const display = Gdk::Display::get_default(); - auto const monitor = display->get_monitor_at_window(win->get_window()); - monitor->get_geometry(monitor_geometry); -#else - auto const default_screen = Gdk::Screen::get_default(); - auto const monitor_number = default_screen->get_monitor_at_window(win->get_window()); - default_screen->get_monitor_geometry(monitor_number, monitor_geometry); -#endif + Gdk::Rectangle monitor_geometry = Inkscape::UI::get_monitor_geometry_at_window(win->get_window()); int w = monitor_geometry.get_width(); int h = monitor_geometry.get_height(); -- cgit v1.2.3