Merged trunk

(bzr r14954.1.30)

5 files changed, 7 insertions, 41 deletions

diff --git a/src/extension/param/bool.cpp b/src/extension/param/bool.cpp
index 119c43f2f..ca61d8c51 100644
--- a/src/extension/param/bool.cpp
+++ b/src/extension/param/bool.cpp
@@ -130,12 +130,8 @@ Gtk::Widget *ParamBool::get_widget(SPDocument * doc, Inkscape::XML::Node * node,
         return NULL;
     }
 
-#if WITH_GTKMM_3_0
-    Gtk::Box * hbox = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL, 4));
+    auto hbox = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL, 4));
     hbox->set_homogeneous(false);
-#else
-    Gtk::HBox * hbox = Gtk::manage(new Gtk::HBox(false, 4));
-#endif
 
     Gtk::Label * label = Gtk::manage(new Gtk::Label(_(_text), Gtk::ALIGN_START));
     label->show();
diff --git a/src/extension/param/float.cpp b/src/extension/param/float.cpp
index c68242371..23a03ea8f 100644
--- a/src/extension/param/float.cpp
+++ b/src/extension/param/float.cpp
@@ -177,12 +177,8 @@ Gtk::Widget * ParamFloat::get_widget(SPDocument * doc, Inkscape::XML::Node * nod
 
     Gtk::HBox * hbox = Gtk::manage(new Gtk::HBox(false, 4));
 
-#if WITH_GTKMM_3_0
-    ParamFloatAdjustment * pfa = new ParamFloatAdjustment(this, doc, node, changeSignal);
+    auto pfa = new ParamFloatAdjustment(this, doc, node, changeSignal);
     Glib::RefPtr<Gtk::Adjustment> fadjust(pfa);
-#else
-    ParamFloatAdjustment * fadjust = Gtk::manage(new ParamFloatAdjustment(this, doc, node, changeSignal));
-#endif
     
     if (_mode == FULL) {
 
@@ -198,11 +194,7 @@ Gtk::Widget * ParamFloat::get_widget(SPDocument * doc, Inkscape::XML::Node * nod
         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
+	auto spin = Gtk::manage(new Inkscape::UI::Widget::SpinButton(fadjust, 0.1, _precision));
         spin->show();
         hbox->pack_start(*spin, false, false);
     }
diff --git a/src/extension/param/int.cpp b/src/extension/param/int.cpp
index f2399b320..222d4f243 100644
--- a/src/extension/param/int.cpp
+++ b/src/extension/param/int.cpp
@@ -158,13 +158,8 @@ ParamInt::get_widget (SPDocument * doc, Inkscape::XML::Node * node, sigc::signal
 
     Gtk::HBox * hbox = Gtk::manage(new Gtk::HBox(false, 4));
 
-
-#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) {
 
@@ -179,11 +174,7 @@ ParamInt::get_widget (SPDocument * doc, Inkscape::XML::Node * node, sigc::signal
         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
+	auto spin = Gtk::manage(new Inkscape::UI::Widget::SpinButton(fadjust, 1.0, 0));
         spin->show();
         hbox->pack_start(*spin, false, false);
     }
diff --git a/src/extension/param/notebook.cpp b/src/extension/param/notebook.cpp
index 20c8e8481..957d12d06 100644
--- a/src/extension/param/notebook.cpp
+++ b/src/extension/param/notebook.cpp
@@ -353,11 +353,7 @@ public:
         // hook function
         this->signal_switch_page().connect(sigc::mem_fun(this, &ParamNotebookWdg::changed_page));
     };
-#if WITH_GTKMM_3_0
     void changed_page(Gtk::Widget *page, guint pagenum);
-#else
-    void changed_page(GtkNotebookPage *page, guint pagenum);
-#endif
     bool activated;
 };
 
@@ -368,11 +364,7 @@ public:
  * is actually visible. This to exclude 'fake' changes when the
  * notebookpages are added or removed.
  */
-#if WITH_GTKMM_3_0
 void ParamNotebookWdg::changed_page(Gtk::Widget * /*page*/, guint pagenum)
-#else
-void ParamNotebookWdg::changed_page(GtkNotebookPage * /*page*/, guint pagenum)
-#endif
 {
     if (get_visible()) {
         _pref->set((int)pagenum, _doc, _node);
diff --git a/src/extension/param/radiobutton.cpp b/src/extension/param/radiobutton.cpp
index 8181c6f51..c54cc0ec3 100644
--- a/src/extension/param/radiobutton.cpp
+++ b/src/extension/param/radiobutton.cpp
@@ -303,15 +303,10 @@ Gtk::Widget * ParamRadioButton::get_widget(SPDocument * doc, Inkscape::XML::Node
         return NULL;
     }
 
-#if WITH_GTKMM_3_0
-    Gtk::Box * hbox = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL, 4));
+    auto hbox = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL, 4));
     hbox->set_homogeneous(false);
-    Gtk::Box * vbox = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL, 0));
+    auto vbox = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL, 0));
     vbox->set_homogeneous(false);
-#else
-    Gtk::HBox * hbox = Gtk::manage(new Gtk::HBox(false, 4));
-    Gtk::VBox * vbox = Gtk::manage(new Gtk::VBox(false, 0));
-#endif
 
     Gtk::Label * label = Gtk::manage(new Gtk::Label(_(_text), Gtk::ALIGN_START, Gtk::ALIGN_START));
     label->show();