From 9abd33133650d77714fccf09d0c9ff27c9b75a78 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Thu, 5 Jul 2012 22:39:08 +0100 Subject: Drop GTK+ 2.20 support. Fixed bugs: - https://launchpad.net/bugs/1020494 (bzr r11529) --- src/extension/param/float.cpp | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/extension/param/float.cpp') diff --git a/src/extension/param/float.cpp b/src/extension/param/float.cpp index 2f1c77d4e..b9ffe68d2 100644 --- a/src/extension/param/float.cpp +++ b/src/extension/param/float.cpp @@ -175,12 +175,7 @@ Gtk::Widget * ParamFloat::get_widget(SPDocument * doc, Inkscape::XML::Node * nod } Gtk::HBox * hbox = Gtk::manage(new Gtk::HBox(false, 4)); - -#if WITH_GTKMM_2_22 Gtk::Label * label = Gtk::manage(new Gtk::Label(_(_text), Gtk::ALIGN_START)); -#else - Gtk::Label * label = Gtk::manage(new Gtk::Label(_(_text), Gtk::ALIGN_LEFT)); -#endif label->show(); hbox->pack_start(*label, true, true, _indent); -- cgit v1.2.3 From 7c0506c103c881790a2e347e2a68aecdf8935d5c Mon Sep 17 00:00:00 2001 From: John Smith Date: Sat, 22 Sep 2012 12:27:14 +0900 Subject: Fix for 1014988 : Converts slide widgets to new spin-scale widget (bzr r11691) --- src/extension/param/float.cpp | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'src/extension/param/float.cpp') 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 #include #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(); -- cgit v1.2.3 From 3c82e8251460b21c8046a418a9fefb700db0a164 Mon Sep 17 00:00:00 2001 From: "Jon A. Cruz" Date: Tue, 4 Jun 2013 01:52:40 -0700 Subject: Correct to compile against recent gtkmm, including updated macports versions. Fixes bug #1179338. Fixed bugs: - https://launchpad.net/bugs/1179338 (bzr r12346.1.1) --- src/extension/param/float.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/extension/param/float.cpp') diff --git a/src/extension/param/float.cpp b/src/extension/param/float.cpp index 81508f6c0..e9c02e91b 100644 --- a/src/extension/param/float.cpp +++ b/src/extension/param/float.cpp @@ -10,6 +10,8 @@ # include "config.h" #endif +#include + #include #include #include -- cgit v1.2.3 From 72d8e897c6b67e46b2a613c4743ef9c13de25059 Mon Sep 17 00:00:00 2001 From: "Jon A. Cruz" Date: Thu, 6 Jun 2013 06:44:11 -0700 Subject: Added configure/ifdef guards to only bring in the needed #include if glibmm has it. (bzr r12353) --- src/extension/param/float.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/extension/param/float.cpp') diff --git a/src/extension/param/float.cpp b/src/extension/param/float.cpp index e9c02e91b..464938f03 100644 --- a/src/extension/param/float.cpp +++ b/src/extension/param/float.cpp @@ -10,7 +10,9 @@ # include "config.h" #endif +#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H #include +#endif #include #include -- cgit v1.2.3