From 5d67bb43568b52c35e281c8b28f051ff2000e9b8 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Sun, 26 Feb 2012 21:46:12 +0000 Subject: Import deprecated GtkRuler API. Probably worth tidying :-) Fixed bugs: - https://launchpad.net/bugs/802125 (bzr r11023) --- src/ui/widget/ruler.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/ui/widget/ruler.cpp') diff --git a/src/ui/widget/ruler.cpp b/src/ui/widget/ruler.cpp index cf0241fd1..a0ad3b391 100644 --- a/src/ui/widget/ruler.cpp +++ b/src/ui/widget/ruler.cpp @@ -20,7 +20,6 @@ #include -#include #include "helper/units.h" #include "widgets/ruler.h" #include "ui/widget/ruler.h" @@ -46,7 +45,7 @@ Ruler::init(SPDesktop *dt, Gtk::Widget &w) _canvas_widget = &w; _dragging = false; _guide = 0; - sp_ruler_set_metric(GTK_RULER(_r->gobj()), SP_PT); + sp_ruler_set_metric(GTK_DEPRECATED_RULER(_r->gobj()), SP_PT); _r->set_range(-500, 500, 0, 1000); } @@ -67,7 +66,7 @@ void Ruler::update_metric() { if (!_dt) return; - sp_ruler_set_metric(GTK_RULER(_r->gobj()), _dt->namedview->getDefaultMetric()); + sp_ruler_set_metric(GTK_DEPRECATED_RULER(_r->gobj()), _dt->namedview->getDefaultMetric()); } /// Returns text to be used for tooltip for ruler. @@ -168,7 +167,7 @@ Ruler::on_button_release_event(GdkEventButton *evb) HRuler::HRuler() { _dt = 0; - _r = static_cast(Glib::wrap(static_cast (sp_hruler_new()))); + _r = static_cast(Glib::wrap(static_cast (sp_hruler_new()))); add(*_r); _horiz_f = true; } @@ -181,7 +180,7 @@ HRuler::~HRuler() VRuler::VRuler() { _dt = 0; - _r = static_cast(Glib::wrap(static_cast (sp_vruler_new()))); + _r = static_cast(Glib::wrap(static_cast (sp_vruler_new()))); add(*_r); _horiz_f = false; } -- cgit v1.2.3