Merge more ruler code

(bzr r11329)

2 files changed, 14 insertions, 17 deletions

diff --git a/src/ui/widget/ruler.cpp b/src/ui/widget/ruler.cpp
index ecbd641a7..3a566d5da 100644
--- a/src/ui/widget/ruler.cpp
+++ b/src/ui/widget/ruler.cpp
@@ -38,12 +38,12 @@ namespace Gtk {
 namespace Deprecated {
 void Ruler::set_range(double lower, double upper, double position, double max_size)
 {
-gtk_deprecated_ruler_set_range(gobj(), lower, upper, position, max_size); 
+sp_ruler_set_range(gobj(), lower, upper, position, max_size); 
 }
 
 void Ruler::get_range(double& lower, double& upper, double& position, double& max_size)
 {
-gtk_deprecated_ruler_get_range(gobj(), &(lower), &(upper), &(position), &(max_size)); 
+sp_ruler_get_range(gobj(), &(lower), &(upper), &(position), &(max_size)); 
 }
 }// namespace Deprecated
 }// namespace Gtk
@@ -60,7 +60,7 @@ Ruler::init(SPDesktop *dt, Gtk::Widget &w)
     _canvas_widget = &w;
     _dragging = false;
     _guide = 0;
-    sp_ruler_set_metric(GTK_DEPRECATED_RULER(_r->gobj()), SP_PT);
+    sp_ruler_set_metric(SP_RULER(_r->gobj()), SP_PT);
     _r->set_range(-500, 500, 0, 1000);
 }
 
@@ -81,7 +81,7 @@ void
 Ruler::update_metric()
 {
     if (!_dt) return;
-    sp_ruler_set_metric(GTK_DEPRECATED_RULER(_r->gobj()), _dt->namedview->getDefaultMetric());
+    sp_ruler_set_metric(SP_RULER(_r->gobj()), _dt->namedview->getDefaultMetric());
 }
 
 /// Returns text to be used for tooltip for ruler.
@@ -182,7 +182,7 @@ Ruler::on_button_release_event(GdkEventButton *evb)
 HRuler::HRuler()
 {
     _dt = 0;
-    _r = static_cast<Gtk::Deprecated::HRuler*>(Glib::wrap(static_cast<GtkWidget*> (sp_hruler_new())));
+    _r = static_cast<Gtk::Deprecated::HRuler*>(Glib::wrap(static_cast<GtkWidget*> (sp_ruler_new(GTK_ORIENTATION_HORIZONTAL))));
     add(*_r);
     _horiz_f = true;
 }
@@ -195,7 +195,7 @@ HRuler::~HRuler()
 VRuler::VRuler()
 {
     _dt = 0;
-    _r = static_cast<Gtk::Deprecated::VRuler*>(Glib::wrap(static_cast<GtkWidget*> (sp_vruler_new())));
+    _r = static_cast<Gtk::Deprecated::VRuler*>(Glib::wrap(static_cast<GtkWidget*> (sp_ruler_new(GTK_ORIENTATION_VERTICAL))));
     add(*_r);
     _horiz_f = false;
 }
diff --git a/src/ui/widget/ruler.h b/src/ui/widget/ruler.h
index d63c585a8..2e22896bd 100644
--- a/src/ui/widget/ruler.h
+++ b/src/ui/widget/ruler.h
@@ -19,10 +19,7 @@ namespace Glib {
     class ustring;
 }
 
-typedef struct _GtkDeprecatedRuler GtkDeprecatedRuler;
-typedef struct _GtkDeprecatedVRuler GtkDeprecatedVRuler;
-typedef struct _GtkDeprecatedHRuler GtkDeprecatedHRuler;
-
+typedef struct _SPRuler SPRuler;
 
 // This is an import of the now-deprecated Gtk::Ruler API.
 namespace Gtk {
@@ -40,14 +37,14 @@ public:
 
 protected:
   explicit Ruler(const Glib::ConstructParams& construct_params);
-  explicit Ruler(GtkDeprecatedRuler* castitem);
+  explicit Ruler(SPRuler* castitem);
 
 public:
   ///Provides access to the underlying C GtkObject.
-  GtkDeprecatedRuler*       gobj()       { return reinterpret_cast<GtkDeprecatedRuler*>(gobject_); }
+  SPRuler*       gobj()       { return reinterpret_cast<SPRuler*>(gobject_); }
 
   ///Provides access to the underlying C GtkObject.
-  const GtkDeprecatedRuler* gobj() const { return reinterpret_cast<GtkDeprecatedRuler*>(gobject_); }
+  const SPRuler* gobj() const { return reinterpret_cast<SPRuler*>(gobject_); }
 
 protected:
   Ruler();
@@ -82,10 +79,10 @@ class VRuler : public Ruler
 
 public:
   ///Provides access to the underlying C GtkObject.
-  GtkDeprecatedVRuler*       gobj()       { return reinterpret_cast<GtkDeprecatedVRuler*>(gobject_); }
+  SPRuler*       gobj()       { return reinterpret_cast<SPRuler*>(gobject_); }
 
   ///Provides access to the underlying C GtkObject.
-  const GtkDeprecatedVRuler* gobj() const { return reinterpret_cast<GtkDeprecatedVRuler*>(gobject_); }
+  const SPRuler* gobj() const { return reinterpret_cast<SPRuler*>(gobject_); }
 
 public:
   VRuler();
@@ -99,10 +96,10 @@ class HRuler : public Ruler
 
 public:
   ///Provides access to the underlying C GtkObject.
-  GtkDeprecatedHRuler*       gobj()       { return reinterpret_cast<GtkDeprecatedHRuler*>(gobject_); }
+  SPRuler*       gobj()       { return reinterpret_cast<SPRuler*>(gobject_); }
 
   ///Provides access to the underlying C GtkObject.
-  const GtkDeprecatedHRuler* gobj() const { return reinterpret_cast<GtkDeprecatedHRuler*>(gobject_); }
+  const SPRuler* gobj() const { return reinterpret_cast<SPRuler*>(gobject_); }
   
 public:
   HRuler();