diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-12-25 23:46:18 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-12-25 23:46:18 +0000 |
| commit | 60efec48f2861fba5e02ca4fff61bfdcef33f56f (patch) | |
| tree | 2dbcec0c9c8d1453c422c10a53d691203f18e965 /src/sp-namedview.cpp | |
| parent | Fix start anchors (diff) | |
| parent | Merge about-box Gtkmm changes (diff) | |
| download | inkscape-60efec48f2861fba5e02ca4fff61bfdcef33f56f.tar.gz inkscape-60efec48f2861fba5e02ca4fff61bfdcef33f56f.zip | |
Merge branch 'master' into powerpencilII
Diffstat (limited to 'src/sp-namedview.cpp')
| -rw-r--r-- | src/sp-namedview.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/sp-namedview.cpp b/src/sp-namedview.cpp index ef22eca2d..99cc6fbfc 100644 --- a/src/sp-namedview.cpp +++ b/src/sp-namedview.cpp @@ -37,7 +37,7 @@ #include "sp-root.h" #include <gtkmm/window.h> -#if WITH_GTKMM_3_22 +#if GTKMM_CHECK_VERSION(3,22,0) # include <gdkmm/monitor.h> #else # include <gdkmm/screen.h> @@ -745,7 +745,7 @@ gdouble const NEWDOC_Y_SCALE = NEWDOC_X_SCALE; Geom::Point calcAnchorPoint(gint const x, gint const y, gint const w, gint const h, gint const minOnscreen) { -#if WITH_GTKMM_3_22 +#if GTKMM_CHECK_VERSION(3,22,0) Gdk::Rectangle screen_geometry; auto const display = Gdk::Display::get_default(); @@ -798,7 +798,7 @@ void sp_namedview_window_from_document(SPDesktop *desktop) // TODO: account for multi-monitor setups (i.e. on which monitor do we want to display Inkscape?) Gdk::Rectangle monitor_geometry; -#if WITH_GTKMM_3_22 +#if GTKMM_CHECK_VERSION(3,22,0) auto const display = Gdk::Display::get_default(); auto const monitor = display->get_primary_monitor(); |