summaryrefslogtreecommitdiffstats
path: root/src/ui/widget/preferences-widget.cpp
diff options
context:
space:
mode:
authorDenis Declara <declara91@gmail.com>2012-03-20 10:09:49 +0000
committerDenis Declara <declara91@gmail.com>2012-03-20 10:09:49 +0000
commit1cd9c8450500b945614a12a762e06c057ee85bbe (patch)
tree9973553a223ef7d6c5f9d18c35766fb3e7296e57 /src/ui/widget/preferences-widget.cpp
parentFix deprecated Gtk::Widget flags (diff)
parentdesktop cutting plotter dxf output. ignore orphaned clones (Bug 957086) (diff)
downloadinkscape-1cd9c8450500b945614a12a762e06c057ee85bbe.tar.gz
inkscape-1cd9c8450500b945614a12a762e06c057ee85bbe.zip
Merged with trunk
(bzr r11073.1.1)
Diffstat (limited to 'src/ui/widget/preferences-widget.cpp')
-rw-r--r--src/ui/widget/preferences-widget.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/ui/widget/preferences-widget.cpp b/src/ui/widget/preferences-widget.cpp
index fec351ab0..a7b51d535 100644
--- a/src/ui/widget/preferences-widget.cpp
+++ b/src/ui/widget/preferences-widget.cpp
@@ -386,8 +386,12 @@ ZoomCorrRuler::redraw() {
Glib::RefPtr<Gdk::Window> window = get_window();
Cairo::RefPtr<Cairo::Context> cr = window->create_cairo_context();
+#if WITH_GTKMM_2_24
+ int w = window->get_width();
+#else
int w, h;
window->get_size(w, h);
+#endif
_drawing_width = w - _border * 2;
cr->set_source_rgb(1.0, 1.0, 1.0);