change spinbox to new one in many places.

(bzr r10176)

22 files changed, 75 insertions, 55 deletions

diff --git a/src/extension/internal/pdf-input-cairo.cpp b/src/extension/internal/pdf-input-cairo.cpp
index 048b26bed..daa185268 100644
--- a/src/extension/internal/pdf-input-cairo.cpp
+++ b/src/extension/internal/pdf-input-cairo.cpp
@@ -31,6 +31,8 @@
 #include <poppler/glib/poppler-document.h>
 #include <poppler/glib/poppler-page.h>
 
+#include "ui/widget/spinbutton.h"
+
 namespace Inkscape {
 namespace Extension {
 namespace Internal {
@@ -67,7 +69,7 @@ PdfImportCairoDialog::PdfImportCairoDialog(PopplerDocument *doc)
     // Page number
     int num_pages = poppler_document_get_n_pages(_poppler_doc);
     Gtk::Adjustment *_pageNumberSpin_adj = Gtk::manage(new class Gtk::Adjustment(1, 1, num_pages, 1, 10, 0));
-    _pageNumberSpin = Gtk::manage(new class Gtk::SpinButton(*_pageNumberSpin_adj, 1, 1));
+    _pageNumberSpin = Gtk::manage(new class Inkscape::UI::Widget::SpinButton(*_pageNumberSpin_adj, 1, 1));
     _labelTotalPages = Gtk::manage(new class Gtk::Label());
     hbox2 = Gtk::manage(new class Gtk::HBox(false, 0));
     // Disable the page selector when there's only one page
diff --git a/src/extension/internal/pdf-input-cairo.h b/src/extension/internal/pdf-input-cairo.h
index ad7c884cb..7581cb0a5 100644
--- a/src/extension/internal/pdf-input-cairo.h
+++ b/src/extension/internal/pdf-input-cairo.h
@@ -20,7 +20,6 @@
 #include <gtkmm/button.h>
 #include <gtkmm/buttonbox.h>
 #include <gtkmm/label.h>
-#include <gtkmm/spinbutton.h>
 #include <gtkmm/box.h>
 #include <gtkmm/checkbutton.h>
 #include <gtkmm/comboboxtext.h>
@@ -39,6 +38,13 @@
 #include "../implementation/implementation.h"
 
 namespace Inkscape {
+
+namespace UI {
+namespace Widget {
+  class SpinButton;
+}
+}
+
 namespace Extension {
 namespace Internal {
 
@@ -64,7 +70,7 @@ private:
     class Gtk::Button * cancelbutton;
     class Gtk::Button * okbutton;
     class Gtk::Label * _labelSelect;
-    class Gtk::SpinButton * _pageNumberSpin;
+    class Inkscape::UI::Widget::SpinButton * _pageNumberSpin;
     class Gtk::Label * _labelTotalPages;
     class Gtk::HBox * hbox2;
     class Gtk::CheckButton * _cropCheck;
diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp
index ae3e473a5..fc2db7e69 100644
--- a/src/extension/internal/pdfinput/pdf-input.cpp
+++ b/src/extension/internal/pdfinput/pdf-input.cpp
@@ -41,6 +41,7 @@
 
 #include "dialogs/dialog-events.h"
 #include <gtk/gtkdialog.h>
+#include "ui/widget/spinbutton.h"
 
 namespace Inkscape {
 namespace Extension {
@@ -75,7 +76,7 @@ PdfImportDialog::PdfImportDialog(PDFDoc *doc, const gchar *uri)
     // Page number
     Gtk::Adjustment *_pageNumberSpin_adj = Gtk::manage(
             new class Gtk::Adjustment(1, 1, _pdf_doc->getNumPages(), 1, 10, 0));
-    _pageNumberSpin = Gtk::manage(new class Gtk::SpinButton(*_pageNumberSpin_adj, 1, 1));
+    _pageNumberSpin = Gtk::manage(new class Inkscape::UI::Widget::SpinButton(*_pageNumberSpin_adj, 1, 1));
     _labelTotalPages = Gtk::manage(new class Gtk::Label());
     hbox2 = Gtk::manage(new class Gtk::HBox(false, 0));
     // Disable the page selector when there's only one page
diff --git a/src/extension/internal/pdfinput/pdf-input.h b/src/extension/internal/pdfinput/pdf-input.h
index 6bf0f11a2..c2fd0b6d8 100644
--- a/src/extension/internal/pdfinput/pdf-input.h
+++ b/src/extension/internal/pdfinput/pdf-input.h
@@ -24,7 +24,6 @@
 #include <gtkmm/button.h>
 #include <gtkmm/buttonbox.h>
 #include <gtkmm/label.h>
-#include <gtkmm/spinbutton.h>
 #include <gtkmm/box.h>
 #include <gtkmm/checkbutton.h>
 #include <gtkmm/comboboxtext.h>
@@ -41,6 +40,13 @@
 #endif
 
 namespace Inkscape {
+
+namespace UI {
+namespace Widget {
+  class SpinButton;
+}
+}
+
 namespace Extension {
 namespace Internal {
 
@@ -66,7 +72,7 @@ private:
     class Gtk::Button * cancelbutton;
     class Gtk::Button * okbutton;
     class Gtk::Label * _labelSelect;
-    class Gtk::SpinButton * _pageNumberSpin;
+    class Inkscape::UI::Widget::SpinButton * _pageNumberSpin;
     class Gtk::Label * _labelTotalPages;
     class Gtk::HBox * hbox2;
     class Gtk::CheckButton * _cropCheck;
diff --git a/src/jabber_whiteboard/pedrogui.h b/src/jabber_whiteboard/pedrogui.h
index d9a66a5e5..f4ebb4544 100644
--- a/src/jabber_whiteboard/pedrogui.h
+++ b/src/jabber_whiteboard/pedrogui.h
@@ -26,6 +26,7 @@
 
 
 #include <gtkmm.h>
+#include "ui/widget/spinbutton.h"
 
 #include "pedro/pedroxmpp.h"
 #include "pedro/pedroconfig.h"
@@ -595,7 +596,7 @@ private:
     Gtk::Label       hostLabel;
     Gtk::Entry       hostField;
     Gtk::Label       portLabel;
-    Gtk::SpinButton  portSpinner;
+    Inkscape::UI::Widget::SpinButton  portSpinner;
     Gtk::Label       userLabel;
     Gtk::Entry       userField;
     Gtk::Label       passLabel;
diff --git a/src/pedro/pedrogui.h b/src/pedro/pedrogui.h
index 4af4f1aac..2898da118 100644
--- a/src/pedro/pedrogui.h
+++ b/src/pedro/pedrogui.h
@@ -26,6 +26,7 @@
 
 
 #include <gtkmm.h>
+#include "ui/widget/spinbutton.h"
 
 #include "pedroxmpp.h"
 #include "pedroconfig.h"
@@ -590,7 +591,7 @@ private:
     Gtk::Label       hostLabel;
     Gtk::Entry       hostField;
     Gtk::Label       portLabel;
-    Gtk::SpinButton  portSpinner;
+    Inkscape::UI::Widget::SpinButton  portSpinner;
     Gtk::Label       userLabel;
     Gtk::Entry       userField;
     Gtk::Label       passLabel;
diff --git a/src/ui/dialog/align-and-distribute.cpp b/src/ui/dialog/align-and-distribute.cpp
index f974ec6ce..81e2b64a9 100644
--- a/src/ui/dialog/align-and-distribute.cpp
+++ b/src/ui/dialog/align-and-distribute.cpp
@@ -20,7 +20,7 @@
 # include <config.h>
 #endif
 
-#include <gtkmm/spinbutton.h>
+#include "ui/widget/spinbutton.h"
 
 #include "desktop-handles.h"
 #include "unclump.h"
@@ -445,8 +445,8 @@ class ActionRemoveOverlaps : public Action {
 private:
     Gtk::Label removeOverlapXGapLabel;
     Gtk::Label removeOverlapYGapLabel;
-    Gtk::SpinButton removeOverlapXGap;
-    Gtk::SpinButton removeOverlapYGap;
+    Inkscape::UI::Widget::SpinButton removeOverlapXGap;
+    Inkscape::UI::Widget::SpinButton removeOverlapYGap;
 
 public:
     ActionRemoveOverlaps(Glib::ustring const &id,
diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp
index 2699d9201..2e17daa11 100644
--- a/src/ui/dialog/filter-effects-dialog.cpp
+++ b/src/ui/dialog/filter-effects-dialog.cpp
@@ -24,7 +24,7 @@
 #include <gtkmm/paned.h>
 #include <gtkmm/scale.h>
 #include <gtkmm/scrolledwindow.h>
-#include <gtkmm/spinbutton.h>
+#include "ui/widget/spinbutton.h"
 #include <gtkmm/stock.h>
 #include <gtkmm/tooltips.h>
 #include <glibmm/i18n.h>
@@ -133,12 +133,12 @@ private:
     const Glib::ustring _true_val, _false_val;
 };
 
-class SpinButtonAttr : public Gtk::SpinButton, public AttrWidget
+class SpinButtonAttr : public Inkscape::UI::Widget::SpinButton, public AttrWidget
 {
 public:
     SpinButtonAttr(double lower, double upper, double step_inc,
                    double climb_rate, int digits, const SPAttributeEnum a, double def, char* tip_text)
-        : Gtk::SpinButton(climb_rate, digits),
+        : Inkscape::UI::Widget::SpinButton(climb_rate, digits),
           AttrWidget(a, def)
     {
         if (tip_text) _tt.set_tip(*this, tip_text);
@@ -248,12 +248,12 @@ public:
         pack_start(_s2, false, false);
     }
 
-    Gtk::SpinButton& get_spinbutton1()
+    Inkscape::UI::Widget::SpinButton& get_spinbutton1()
     {
         return _s1;
     }
 
-    Gtk::SpinButton& get_spinbutton2()
+    Inkscape::UI::Widget::SpinButton& get_spinbutton2()
     {
         return _s2;
     }
@@ -285,7 +285,7 @@ public:
 
     }
 private:
-    Gtk::SpinButton _s1, _s2;
+    Inkscape::UI::Widget::SpinButton _s1, _s2;
 };
 
 class ColorButton : public Gtk::ColorButton, public AttrWidget
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index 8681ed98f..7963dd512 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -38,6 +38,7 @@
 #include "selection-chemistry.h"
 #include "xml/repr.h"
 #include "ui/widget/style-swatch.h"
+#include "ui/widget/spinbutton.h"
 #include "display/nr-filter-gaussian.h"
 #include "display/nr-filter-types.h"
 #include "color-profile-fns.h"
@@ -70,7 +71,7 @@ InkscapePreferences::InkscapePreferences()
       _current_page(0)
 {
     //get the width of a spinbutton
-    Gtk::SpinButton* sb = new Gtk::SpinButton;
+    Inkscape::UI::Widget::SpinButton* sb = new Inkscape::UI::Widget::SpinButton;
     sb->set_width_chars(6);
     _getContents()->add(*sb);
     show_all_children();
diff --git a/src/ui/dialog/layers.h b/src/ui/dialog/layers.h
index b7e81480c..018357425 100644
--- a/src/ui/dialog/layers.h
+++ b/src/ui/dialog/layers.h
@@ -19,7 +19,7 @@
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/box.h>
 #include <gtkmm/buttonbox.h>
-#include <gtkmm/spinbutton.h>
+#include "ui/widget/spinbutton.h"
 #include <gtkmm/notebook.h>
 
 //#include "ui/previewholder.h"
@@ -117,7 +117,7 @@ private:
     Gtk::HButtonBox _buttonsRow;
     Gtk::ScrolledWindow _scroller;
     Gtk::Menu _popupMenu;
-    Gtk::SpinButton _spinBtn;
+    Inkscape::UI::Widget::SpinButton _spinBtn;
     Gtk::VBox _layersPage;
 
     UI::Widget::StyleSubject::CurrentLayer _subject;
diff --git a/src/ui/dialog/svg-fonts-dialog.cpp b/src/ui/dialog/svg-fonts-dialog.cpp
index 2d1b5ae39..d836bfa22 100644
--- a/src/ui/dialog/svg-fonts-dialog.cpp
+++ b/src/ui/dialog/svg-fonts-dialog.cpp
@@ -137,7 +137,7 @@ Gtk::HBox* SvgFontsDialog::AttrCombo(gchar* lbl, const SPAttributeEnum /*attr*/)
 Gtk::HBox* SvgFontsDialog::AttrSpin(gchar* lbl){
     Gtk::HBox* hbox = Gtk::manage(new Gtk::HBox());
     hbox->add(* Gtk::manage(new Gtk::Label(lbl)) );
-    hbox->add(* Gtk::manage(new Gtk::SpinBox()) );
+    hbox->add(* Gtk::manage(new Inkscape::UI::Widget::SpinBox()) );
     hbox->show_all();
     return hbox;
 }*/
diff --git a/src/ui/dialog/svg-fonts-dialog.h b/src/ui/dialog/svg-fonts-dialog.h
index e819187a1..50821cc6c 100644
--- a/src/ui/dialog/svg-fonts-dialog.h
+++ b/src/ui/dialog/svg-fonts-dialog.h
@@ -12,6 +12,7 @@
 #define INKSCAPE_UI_DIALOG_SVG_FONTS_H
 
 #include "ui/widget/panel.h"
+#include "ui/widget/spinbutton.h"
 #include "sp-font.h"
 #include "sp-font-face.h"
 #include "verbs.h"
@@ -206,7 +207,7 @@ private:
     SvgFontDrawingArea _font_da, kerning_preview;
     GlyphComboBox first_glyph, second_glyph;
     SPGlyphKerning* kerning_pair;
-    Gtk::SpinButton setwidth_spin;
+    Inkscape::UI::Widget::SpinButton setwidth_spin;
     Gtk::HScale kerning_slider;
 
     class EntryWidget : public Gtk::HBox
diff --git a/src/ui/dialog/tile.h b/src/ui/dialog/tile.h
index 09a648e1f..fe77a9098 100644
--- a/src/ui/dialog/tile.h
+++ b/src/ui/dialog/tile.h
@@ -143,13 +143,13 @@ private:
     Gtk::VBox             RowHeightVBox;
     Gtk::HBox             RowHeightBox;
     Gtk::Label            RowHeightLabel;
-    Gtk::SpinButton       RowHeightSpinner;
+    Inkscape::UI::Widget::SpinButton RowHeightSpinner;
 
     // Column width
     Gtk::VBox             ColumnWidthVBox;
     Gtk::HBox             ColumnWidthBox;
     Gtk::Label            ColumnWidthLabel;
-    Gtk::SpinButton       ColumnWidthSpinner;
+    Inkscape::UI::Widget::SpinButton ColumnWidthSpinner;
 };
 
 
diff --git a/src/ui/dialog/tracedialog.cpp b/src/ui/dialog/tracedialog.cpp
index f6dd6cb28..083cd0077 100644
--- a/src/ui/dialog/tracedialog.cpp
+++ b/src/ui/dialog/tracedialog.cpp
@@ -16,7 +16,7 @@
 
 #include <gtkmm/notebook.h>
 #include <gtkmm/frame.h>
-#include <gtkmm/spinbutton.h>
+#include "ui/widget/spinbutton.h"
 #include <gtkmm/stock.h>
 
 #include <gtk/gtkdialog.h> //for GTK_RESPONSE* types
@@ -109,7 +109,7 @@ class TraceDialogImpl : public TraceDialog
     Gtk::HBox             modeBrightnessBox;
     Gtk::RadioButton      modeBrightnessRadioButton;
     Gtk::Label            modeBrightnessSpinnerLabel;
-    Gtk::SpinButton       modeBrightnessSpinner;
+    Inkscape::UI::Widget::SpinButton modeBrightnessSpinner;
     //edge detection
     Gtk::Frame            modeCannyFrame;
     Gtk::HBox             modeCannyBox;
@@ -117,16 +117,16 @@ class TraceDialogImpl : public TraceDialog
     Gtk::RadioButton      modeCannyRadioButton;
     //Gtk::HSeparator     modeCannySeparator;
     //Gtk::Label          modeCannyLoSpinnerLabel;
-    //Gtk::SpinButton     modeCannyLoSpinner;
+    //Inkscape::UI::Widget::SpinButton     modeCannyLoSpinner;
     Gtk::Label            modeCannyHiSpinnerLabel;
-    Gtk::SpinButton       modeCannyHiSpinner;
+    Inkscape::UI::Widget::SpinButton       modeCannyHiSpinner;
     //quantization
     Gtk::Frame            modeQuantFrame;
     Gtk::HBox             modeQuantBox;
     Gtk::VBox             modeQuantVBox;
     Gtk::RadioButton      modeQuantRadioButton;
     Gtk::Label            modeQuantNrColorLabel;
-    Gtk::SpinButton       modeQuantNrColorSpinner;
+    Inkscape::UI::Widget::SpinButton       modeQuantNrColorSpinner;
     //params
     Gtk::CheckButton      modeInvertButton;
     Gtk::HBox             modeInvertBox;
@@ -137,7 +137,7 @@ class TraceDialogImpl : public TraceDialog
     //brightness
     Gtk::HBox             modeMultiScanHBox1;
     Gtk::RadioButton      modeMultiScanBrightnessRadioButton;
-    Gtk::SpinButton       modeMultiScanNrColorSpinner;
+    Inkscape::UI::Widget::SpinButton       modeMultiScanNrColorSpinner;
     //colors
     Gtk::HBox             modeMultiScanHBox2;
     Gtk::RadioButton      modeMultiScanColorRadioButton;
@@ -162,15 +162,15 @@ class TraceDialogImpl : public TraceDialog
     Gtk::HBox             optionsSpecklesBox;
     Gtk::CheckButton      optionsSpecklesButton;
     Gtk::Label            optionsSpecklesSizeLabel;
-    Gtk::SpinButton       optionsSpecklesSizeSpinner;
+    Inkscape::UI::Widget::SpinButton optionsSpecklesSizeSpinner;
     Gtk::HBox             optionsCornersBox;
     Gtk::CheckButton      optionsCornersButton;
     Gtk::Label            optionsCornersThresholdLabel;
-    Gtk::SpinButton       optionsCornersThresholdSpinner;
+    Inkscape::UI::Widget::SpinButton optionsCornersThresholdSpinner;
     Gtk::HBox             optionsOptimBox;
     Gtk::CheckButton      optionsOptimButton;
     Gtk::Label            optionsOptimToleranceLabel;
-    Gtk::SpinButton       optionsOptimToleranceSpinner;
+    Inkscape::UI::Widget::SpinButton optionsOptimToleranceSpinner;
 
 
     //#### Credits
diff --git a/src/ui/widget/object-composite-settings.h b/src/ui/widget/object-composite-settings.h
index 76538d6a7..8ef31a889 100644
--- a/src/ui/widget/object-composite-settings.h
+++ b/src/ui/widget/object-composite-settings.h
@@ -17,7 +17,7 @@
 #include <gtkmm/alignment.h>
 #include <gtkmm/adjustment.h>
 #include <gtkmm/label.h>
-#include <gtkmm/spinbutton.h>
+#include "ui/widget/spinbutton.h"
 #include <gtkmm/scale.h>
 
 #include <glibmm/ustring.h>
@@ -47,7 +47,7 @@ private:
     Gtk::Label      _opacity_label;
     Gtk::Adjustment _opacity_adjustment;
     Gtk::HScale     _opacity_hscale;
-    Gtk::SpinButton _opacity_spin_button;
+    Inkscape::UI::Widget::SpinButton _opacity_spin_button;
 
     StyleSubject *_subject;
 
diff --git a/src/ui/widget/preferences-widget.h b/src/ui/widget/preferences-widget.h
index 4cd2ff569..758ab38cd 100644
--- a/src/ui/widget/preferences-widget.h
+++ b/src/ui/widget/preferences-widget.h
@@ -17,7 +17,7 @@
 #include <vector>
 #include <gtkmm/table.h>
 #include <gtkmm/comboboxtext.h>
-#include <gtkmm/spinbutton.h>
+#include "ui/widget/spinbutton.h"
 #include <gtkmm/tooltips.h>
 #include <gtkmm/treeview.h>
 #include <gtkmm/radiobutton.h>
@@ -117,7 +117,7 @@ private:
     void on_spinbutton_value_changed();
     void on_unit_changed();
 
-    Gtk::SpinButton _sb;
+    Inkscape::UI::Widget::SpinButton _sb;
     UnitMenu        _unit;
     Gtk::HScale     _slider;
     ZoomCorrRuler   _ruler;
@@ -135,7 +135,7 @@ private:
     void on_spinbutton_value_changed();
     
     Glib::ustring _prefs_path;
-    Gtk::SpinButton _sb;
+    Inkscape::UI::Widget::SpinButton _sb;
     Gtk::HScale     _slider;
     bool freeze; // used to block recursive updates of slider and spinbutton
 };
diff --git a/src/ui/widget/selected-style.h b/src/ui/widget/selected-style.h
index e74d5b1ae..0caa7fe4c 100644
--- a/src/ui/widget/selected-style.h
+++ b/src/ui/widget/selected-style.h
@@ -21,7 +21,7 @@
 #include <gtkmm/menu.h>
 #include <gtkmm/menuitem.h>
 #include <gtkmm/adjustment.h>
-#include <gtkmm/spinbutton.h>
+#include "ui/widget/spinbutton.h"
 
 #include <stddef.h>
 #include <sigc++/sigc++.h>
@@ -138,7 +138,7 @@ protected:
 
     Gtk::EventBox _opacity_place;
     Gtk::Adjustment _opacity_adjustment;
-    Gtk::SpinButton _opacity_sb;
+    Inkscape::UI::Widget::SpinButton _opacity_sb;
 
     Gtk::Label _na[2];
     Glib::ustring __na[2];
diff --git a/src/ui/widget/spin-slider.cpp b/src/ui/widget/spin-slider.cpp
index faafc63b4..259b057aa 100644
--- a/src/ui/widget/spin-slider.cpp
+++ b/src/ui/widget/spin-slider.cpp
@@ -90,11 +90,11 @@ Gtk::HScale& SpinSlider::get_scale()
     return _scale;
 }
 
-const Gtk::SpinButton& SpinSlider::get_spin_button() const
+const Inkscape::UI::Widget::SpinButton& SpinSlider::get_spin_button() const
 {
     return _spin;
 }
-Gtk::SpinButton& SpinSlider::get_spin_button()
+Inkscape::UI::Widget::SpinButton& SpinSlider::get_spin_button()
 {
     return _spin;
 }
diff --git a/src/ui/widget/spin-slider.h b/src/ui/widget/spin-slider.h
index a4d0aa9d6..703c5d896 100644
--- a/src/ui/widget/spin-slider.h
+++ b/src/ui/widget/spin-slider.h
@@ -15,7 +15,7 @@
 #include <gtkmm/adjustment.h>
 #include <gtkmm/box.h>
 #include <gtkmm/scale.h>
-#include <gtkmm/spinbutton.h>
+#include "spinbutton.h"
 #include "attr-widget.h"
 
 namespace Inkscape {
@@ -42,8 +42,8 @@ public:
     const Gtk::HScale& get_scale() const;
     Gtk::HScale& get_scale();
 
-    const Gtk::SpinButton& get_spin_button() const;
-    Gtk::SpinButton& get_spin_button();
+    const Inkscape::UI::Widget::SpinButton& get_spin_button() const;
+    Inkscape::UI::Widget::SpinButton& get_spin_button();
 
     void set_update_policy(const Gtk::UpdateType);
 
@@ -52,7 +52,7 @@ public:
 private:
     Gtk::Adjustment _adjustment;
     Gtk::HScale _scale;
-    Gtk::SpinButton _spin;
+    Inkscape::UI::Widget::SpinButton _spin;
 };
 
 // Contains two SpinSliders for controlling number-opt-number attributes
diff --git a/src/ui/widget/zoom-status.h b/src/ui/widget/zoom-status.h
index 58d595329..85c3eeee1 100644
--- a/src/ui/widget/zoom-status.h
+++ b/src/ui/widget/zoom-status.h
@@ -13,7 +13,7 @@
  */
 
 #include <gtkmm/adjustment.h>
-#include <gtkmm/spinbutton.h>
+#include "ui/widget/spinbutton.h"
 
 struct SPDesktop;
 
@@ -22,7 +22,7 @@ namespace Inkscape {
     namespace UI {
         namespace Widget {
 
-class ZoomStatus : public Gtk::SpinButton
+class ZoomStatus : public Inkscape::UI::Widget::SpinButton
 {
 public:
     ZoomStatus();
diff --git a/src/widgets/dash-selector.cpp b/src/widgets/dash-selector.cpp
index e7e029334..dead653de 100644
--- a/src/widgets/dash-selector.cpp
+++ b/src/widgets/dash-selector.cpp
@@ -32,7 +32,7 @@
 
 #include <gtkmm/optionmenu.h>
 #include <gtkmm/adjustment.h>
-#include <gtkmm/spinbutton.h>
+#include "ui/widget/spinbutton.h"
 
 
 #include "dash-selector.h"
@@ -73,7 +73,7 @@ SPDashSelector::SPDashSelector() {
     dash->set_menu(*m);
 
     offset = new Gtk::Adjustment(0.0, 0.0, 10.0, 0.1, 1.0, 0.0);
-    Gtk::SpinButton *sb = new Gtk::SpinButton(*offset, 0.1, 2);
+    Inkscape::UI::Widget::SpinButton *sb = new Inkscape::UI::Widget::SpinButton(*offset, 0.1, 2);
     tt->set_tip(*sb, _("Pattern offset"));
 
     sp_dialog_defocus_on_enter_cpp(sb);
diff --git a/src/widgets/stroke-style.cpp b/src/widgets/stroke-style.cpp
index 555418269..99d8228c8 100644
--- a/src/widgets/stroke-style.cpp
+++ b/src/widgets/stroke-style.cpp
@@ -55,6 +55,7 @@
 #include "widgets/paint-selector.h"
 #include "widgets/sp-widget.h"
 #include "widgets/spw-utilities.h"
+#include "ui/widget/spinbutton.h"
 #include "xml/repr.h"
 
 #include "stroke-style.h"
@@ -653,7 +654,7 @@ sp_stroke_style_line_widget_new(void)
     Gtk::Container *spw;
     Gtk::Table *t;
     Gtk::Adjustment *a;
-    Gtk::SpinButton *sb;
+    Inkscape::UI::Widget::SpinButton *sb;
     Gtk::RadioButton *tb;
     Gtk::HBox *f, *hb;
 
@@ -688,7 +689,7 @@ sp_stroke_style_line_widget_new(void)
 
     a = new Gtk::Adjustment(1.0, 0.0, 1000.0, 0.1, 10.0, 0.0);
     spw->set_data("width", a);
-    sb = new Gtk::SpinButton(*a, 0.1, 3);
+    sb = new Inkscape::UI::Widget::SpinButton(*a, 0.1, 3);
     tt->set_tip(*sb, _("Stroke width"));
     sb->show();
     spw_label(t, C_("Stroke width", "_Width:"), 0, i, sb);
@@ -765,7 +766,7 @@ sp_stroke_style_line_widget_new(void)
     a = new Gtk::Adjustment(4.0, 0.0, 100.0, 0.1, 10.0, 0.0);
     spw->set_data("miterlimit", a);
 
-    sb = new Gtk::SpinButton(*a, 0.1, 2);
+    sb = new Inkscape::UI::Widget::SpinButton(*a, 0.1, 2);
     tt->set_tip(*sb, _("Maximum length of the miter (in units of stroke width)"));
     sb->show();
     spw_label(t, _("Miter _limit:"), 0, i, sb);
@@ -1057,8 +1058,8 @@ sp_stroke_style_line_update(Gtk::Container *spw, Inkscape::Selection *sel)
         tb = static_cast<Gtk::RadioButton *>(spw->get_data("bevel join"));
         tb->set_sensitive(enabled);
 
-        Gtk::SpinButton* sb = NULL;
-        sb = static_cast<Gtk::SpinButton *>(spw->get_data("miterlimit_sb"));
+        Inkscape::UI::Widget::SpinButton* sb = NULL;
+        sb = static_cast<Inkscape::UI::Widget::SpinButton *>(spw->get_data("miterlimit_sb"));
         sb->set_sensitive(enabled);
 
         tb = static_cast<Gtk::RadioButton *>(spw->get_data("cap butt"));