1 files changed, 19 insertions, 32 deletions

diff --git a/src/extension/param/int.cpp b/src/extension/param/int.cpp
index dda801282..357f98590 100644
--- a/src/extension/param/int.cpp
+++ b/src/extension/param/int.cpp
@@ -26,17 +26,19 @@ namespace Extension {
 
 
 /** Use the superclass' allocator and set the \c _value. */
-ParamInt::ParamInt (const gchar * name,
-                    const gchar * guitext,
-                    const gchar * desc,
-                    const Parameter::_scope_t scope,
-                    bool gui_hidden,
-                    const gchar * gui_tip,
-                    Inkscape::Extension::Extension * ext,
-                    Inkscape::XML::Node * xml,
-                    AppearanceMode mode) :
-        Parameter(name, guitext, desc, scope, gui_hidden, gui_tip, ext),
-                  _value(0), _mode(mode), _indent(0), _min(0), _max(10)
+ParamInt::ParamInt(const gchar * name,
+                   const gchar * text,
+                   const gchar * description,
+                   bool hidden,
+                   int indent,
+                   Inkscape::Extension::Extension * ext,
+                   Inkscape::XML::Node * xml,
+                   AppearanceMode mode)
+    : Parameter(name, text, description, hidden, indent, ext)
+    , _value(0)
+    , _mode(mode)
+    , _min(0)
+    , _max(10)
 {
     const char * defaultval = NULL;
     if (xml->firstChild() != NULL) {
@@ -61,11 +63,6 @@ ParamInt::ParamInt (const gchar * name,
         _min = 0;
     }
 
-    const char * indent = xml->attribute("indent");
-    if (indent != NULL) {
-        _indent = atoi(indent) * 12;
-    }
-
     gchar *pref_name = this->pref_name();
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     _value = prefs->getInt(extension_pref_root + pref_name, _value);
@@ -151,38 +148,28 @@ void ParamIntAdjustment::val_changed(void)
 Gtk::Widget *
 ParamInt::get_widget (SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal)
 {
-    if (_gui_hidden) {
+    if (_hidden) {
         return NULL;
     }
 
-    Gtk::HBox * hbox = Gtk::manage(new Gtk::HBox(false, 4));
-
+    Gtk::HBox * hbox = Gtk::manage(new Gtk::HBox(false, Parameter::GUI_PARAM_WIDGETS_SPACING));
 
-#if WITH_GTKMM_3_0
-    ParamIntAdjustment * pia = new ParamIntAdjustment(this, doc, node, changeSignal);
+    auto pia = new ParamIntAdjustment(this, doc, node, changeSignal);
     Glib::RefPtr<Gtk::Adjustment> fadjust(pia);
-#else
-    ParamIntAdjustment * fadjust = Gtk::manage(new ParamIntAdjustment(this, doc, node, changeSignal));
-#endif
 
     if (_mode == FULL) {
 
         UI::Widget::SpinScale *scale = new UI::Widget::SpinScale(_text, fadjust, 0);
         scale->set_size_request(400, -1);
         scale->show();
-        hbox->pack_start(*scale, false, false);
+        hbox->pack_start(*scale, true, true);
     }
     else if (_mode == MINIMAL) {
-   
         Gtk::Label * label = Gtk::manage(new Gtk::Label(_text, Gtk::ALIGN_START));
         label->show();
-        hbox->pack_start(*label, true, true, _indent);
+        hbox->pack_start(*label, true, true);
 
-#if WITH_GTKMM_3_0 
-    Inkscape::UI::Widget::SpinButton * spin = Gtk::manage(new Inkscape::UI::Widget::SpinButton(fadjust, 1.0, 0));
-#else
-    Inkscape::UI::Widget::SpinButton * spin = Gtk::manage(new Inkscape::UI::Widget::SpinButton(*fadjust, 1.0, 0));
-#endif
+	auto spin = Gtk::manage(new Inkscape::UI::Widget::SpinButton(fadjust, 1.0, 0));
         spin->show();
         hbox->pack_start(*spin, false, false);
     }