change spinbox to new one in many places.

(bzr r10176)

14 files changed, 42 insertions, 40 deletions

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();