goodbye pixmaps and pixbufs (no longer) used by Gtkmm2ext::PixFader

git-svn-id: svn://localhost/ardour2/branches/3.0@13827 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2013-01-10 15:25:11 +00:00
parent 31172d0c71
commit b1029a3caf
13 changed files with 42 additions and 189 deletions

View file

@ -28,15 +28,9 @@
using namespace Gtkmm2ext;
using namespace PBD;
SliderController::SliderController (
Glib::RefPtr<Gdk::Pixbuf> image,
Glib::RefPtr<Gdk::Pixbuf> image_desensitised,
Gtk::Adjustment *adj,
int orientation,
int fader_length
)
: PixFader (image, image_desensitised, *adj, orientation, fader_length),
spin (*adj, 0, 2)
SliderController::SliderController (Gtk::Adjustment *adj, int orientation, int fader_length)
: PixFader (*adj, orientation, fader_length)
, spin (*adj, 0, 2)
{
spin.set_name ("SliderControllerValue");
spin.set_size_request (70,-1); // should be based on font size somehow
@ -60,11 +54,9 @@ SliderController::on_button_press_event (GdkEventButton *ev)
return PixFader::on_button_press_event (ev);
}
VSliderController::VSliderController (Glib::RefPtr<Gdk::Pixbuf> image, Glib::RefPtr<Gdk::Pixbuf> image_desensitised,
Gtk::Adjustment *adj, int fader_length,
bool with_numeric)
VSliderController::VSliderController (Gtk::Adjustment *adj, int fader_length, bool with_numeric)
: SliderController (image, image_desensitised, adj, VERT, fader_length)
: SliderController (adj, VERT, fader_length)
{
if (with_numeric) {
spin_frame.add (spin);
@ -75,11 +67,10 @@ VSliderController::VSliderController (Glib::RefPtr<Gdk::Pixbuf> image, Glib::Ref
}
}
HSliderController::HSliderController (Glib::RefPtr<Gdk::Pixbuf> image, Glib::RefPtr<Gdk::Pixbuf> image_desensitised,
Gtk::Adjustment *adj, int fader_length,
HSliderController::HSliderController (Gtk::Adjustment *adj, int fader_length,
bool with_numeric)
: SliderController (image, image_desensitised, adj, HORIZ, fader_length)
: SliderController (adj, HORIZ, fader_length)
{
if (with_numeric) {
spin_frame.add (spin);