merge from trunk (r11955)

(bzr r11687.1.3)

4 files changed, 26 insertions, 32 deletions

diff --git a/src/extension/param/enum.cpp b/src/extension/param/enum.cpp
index b1968a4d6..18a73beb6 100644
--- a/src/extension/param/enum.cpp
+++ b/src/extension/param/enum.cpp
@@ -242,11 +242,7 @@ Gtk::Widget *ParamComboBox::get_widget(SPDocument * doc, Inkscape::XML::Node * n
     for (GSList * list = choices; list != NULL; list = g_slist_next(list)) {
         enumentry * entr = reinterpret_cast<enumentry *>(list->data);
         Glib::ustring text = entr->guitext;
-#if WITH_GTKMM_2_24
         combo->append(text);
-#else
-        combo->append_text(text);
-#endif
 
         if ( _value && !entr->value.compare(_value) ) {
             settext = entr->guitext;
diff --git a/src/extension/param/float.cpp b/src/extension/param/float.cpp
index b9ffe68d2..81508f6c0 100644
--- a/src/extension/param/float.cpp
+++ b/src/extension/param/float.cpp
@@ -14,6 +14,7 @@
 #include <gtkmm/box.h>
 #include <gtkmm/scale.h>
 #include "ui/widget/spinbutton.h"
+#include "ui/widget/spin-scale.h"
 
 #include "xml/node.h"
 #include "extension/extension.h"
@@ -175,9 +176,6 @@ Gtk::Widget * ParamFloat::get_widget(SPDocument * doc, Inkscape::XML::Node * nod
     }
 
     Gtk::HBox * hbox = Gtk::manage(new Gtk::HBox(false, 4));
-    Gtk::Label * label = Gtk::manage(new Gtk::Label(_(_text), Gtk::ALIGN_START));
-    label->show();
-    hbox->pack_start(*label, true, true, _indent);
 
 #if WITH_GTKMM_3_0
     ParamFloatAdjustment * pfa = new ParamFloatAdjustment(this, doc, node, changeSignal);
@@ -187,24 +185,27 @@ Gtk::Widget * ParamFloat::get_widget(SPDocument * doc, Inkscape::XML::Node * nod
 #endif
     
     if (_mode == FULL) {
-#if WITH_GTKMM_3_0
-        Gtk::HScale * scale = Gtk::manage(new Gtk::HScale(fadjust));
-#else
-        Gtk::HScale * scale = Gtk::manage(new Gtk::HScale(*fadjust));
-#endif
-        scale->set_draw_value(false);
-        scale->set_size_request(200, -1);
+
+        UI::Widget::SpinScale *scale = new UI::Widget::SpinScale(_(_text), fadjust, _precision);
+        scale->set_size_request(400, -1);
         scale->show();
         hbox->pack_start(*scale, false, false);
+
     }
+    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);
 
 #if WITH_GTKMM_3_0
     Inkscape::UI::Widget::SpinButton * spin = Gtk::manage(new Inkscape::UI::Widget::SpinButton(fadjust, 0.1, _precision));
 #else
     Inkscape::UI::Widget::SpinButton * spin = Gtk::manage(new Inkscape::UI::Widget::SpinButton(*fadjust, 0.1, _precision));
 #endif
-    spin->show();
-    hbox->pack_start(*spin, false, false);
+        spin->show();
+        hbox->pack_start(*spin, false, false);
+    }
 
     hbox->show();
 
diff --git a/src/extension/param/int.cpp b/src/extension/param/int.cpp
index 7cb930f50..c286018fd 100644
--- a/src/extension/param/int.cpp
+++ b/src/extension/param/int.cpp
@@ -14,6 +14,7 @@
 #include <gtkmm/box.h>
 #include <gtkmm/scale.h>
 #include "ui/widget/spinbutton.h"
+#include "ui/widget/spin-scale.h"
 
 #include "xml/node.h"
 #include "extension/extension.h"
@@ -156,9 +157,7 @@ ParamInt::get_widget (SPDocument * doc, Inkscape::XML::Node * node, sigc::signal
     }
 
     Gtk::HBox * hbox = Gtk::manage(new Gtk::HBox(false, 4));
-    Gtk::Label * label = Gtk::manage(new Gtk::Label(_(_text), Gtk::ALIGN_START));
-    label->show();
-    hbox->pack_start(*label, true, true, _indent);
+
 
 #if WITH_GTKMM_3_0
     ParamIntAdjustment * pia = new ParamIntAdjustment(this, doc, node, changeSignal);
@@ -168,24 +167,26 @@ ParamInt::get_widget (SPDocument * doc, Inkscape::XML::Node * node, sigc::signal
 #endif
 
     if (_mode == FULL) {
-#if WITH_GTKMM_3_0
-        Gtk::HScale * scale = Gtk::manage(new Gtk::HScale(fadjust));
-#else
-        Gtk::HScale * scale = Gtk::manage(new Gtk::HScale(*fadjust));
-#endif
-        scale->set_draw_value(false);
-        scale->set_size_request(200, -1);
+
+        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);
     }
+    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);
+
 #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
-    spin->show();
-    hbox->pack_start(*spin, false, false);
+        spin->show();
+        hbox->pack_start(*spin, false, false);
+    }
 
     hbox->show();
 
diff --git a/src/extension/param/radiobutton.cpp b/src/extension/param/radiobutton.cpp
index 5b5e179d2..921c322b6 100644
--- a/src/extension/param/radiobutton.cpp
+++ b/src/extension/param/radiobutton.cpp
@@ -305,11 +305,7 @@ Gtk::Widget * ParamRadioButton::get_widget(SPDocument * doc, Inkscape::XML::Node
         switch ( _mode ) {
             case MINIMAL:
             {
-#if WITH_GTKMM_2_24
                 cbt->append(*text);
-#else
-                cbt->append_text(*text);
-#endif
                 if (!entr->value->compare(_value)) {
                     cbt->set_active_text(*text);
                     comboSet = true;