diff options
| author | Denis Declara <declara91@gmail.com> | 2012-05-05 13:32:42 +0000 |
|---|---|---|
| committer | Denis Declara <declara91@gmail.com> | 2012-05-05 13:32:42 +0000 |
| commit | aeb9c1bde66de096910757abb17dedb94ad74207 (patch) | |
| tree | c0adf97685b0fa8af1553b14d20601f280492762 /src/extension/param/float.cpp | |
| parent | Fixed some math, so that the objects now line up correctly (diff) | |
| parent | Adding checks to prevent null pointer dereferences (diff) | |
| download | inkscape-aeb9c1bde66de096910757abb17dedb94ad74207.tar.gz inkscape-aeb9c1bde66de096910757abb17dedb94ad74207.zip | |
Trunk merge
(bzr r11073.1.29)
Diffstat (limited to 'src/extension/param/float.cpp')
| -rw-r--r-- | src/extension/param/float.cpp | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/extension/param/float.cpp b/src/extension/param/float.cpp index 0e1d1c22a..2f1c77d4e 100644 --- a/src/extension/param/float.cpp +++ b/src/extension/param/float.cpp @@ -184,17 +184,30 @@ 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 + ParamFloatAdjustment * 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) { +#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); scale->show(); hbox->pack_start(*scale, false, false); } - + +#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); |