From 630be8274013c5eef5f19e19a14bc6d759aada5a Mon Sep 17 00:00:00 2001 From: Alexander Valavanis Date: Sun, 26 May 2019 16:11:07 +0100 Subject: Rm unused code now Gtk+ >= 3.22 dependency is set --- src/ui/monitor.cpp | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) (limited to 'src/ui/monitor.cpp') diff --git a/src/ui/monitor.cpp b/src/ui/monitor.cpp index df9a1ac15..a9a3f8398 100644 --- a/src/ui/monitor.cpp +++ b/src/ui/monitor.cpp @@ -10,25 +10,18 @@ * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ +#include #include #include #include "include/gtkmm_version.h" -#if GTKMM_CHECK_VERSION(3,22,0) -# include -#else -# include -#endif - - namespace Inkscape { namespace UI { /** get monitor geometry of primary monitor */ Gdk::Rectangle get_monitor_geometry_primary() { Gdk::Rectangle monitor_geometry; -#if GTKMM_CHECK_VERSION(3,22,0) auto const display = Gdk::Display::get_default(); auto monitor = display->get_primary_monitor(); @@ -38,41 +31,24 @@ Gdk::Rectangle get_monitor_geometry_primary() { } monitor->get_geometry(monitor_geometry); -#else - auto const default_screen = Gdk::Screen::get_default(); - auto const monitor_number = default_screen->get_primary_monitor(); - default_screen->get_monitor_geometry(monitor_number, monitor_geometry); -#endif return monitor_geometry; } /** get monitor geometry of monitor containing largest part of window */ Gdk::Rectangle get_monitor_geometry_at_window(const Glib::RefPtr& window) { 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(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(window); - default_screen->get_monitor_geometry(monitor_number, monitor_geometry); -#endif return monitor_geometry; } /** get monitor geometry of monitor at (or closest to) point on combined screen area */ Gdk::Rectangle get_monitor_geometry_at_point(int x, int y) { 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_point(x ,y); monitor->get_geometry(monitor_geometry); -#else - auto const default_screen = Gdk::Screen::get_default(); - auto const monitor_number = default_screen->get_monitor_at_point(x, y); - default_screen->get_monitor_geometry(monitor_number, monitor_geometry); -#endif return monitor_geometry; } -- cgit v1.2.3