remove cruft from SliderController

2 files changed, 12 insertions, 44 deletions

diff --git a/libs/gtkmm2ext/gtkmm2ext/slider_controller.h b/libs/gtkmm2ext/gtkmm2ext/slider_controller.h
index b04c2cb005..2b4205c2ca 100644
--- a/libs/gtkmm2ext/gtkmm2ext/slider_controller.h
+++ b/libs/gtkmm2ext/gtkmm2ext/slider_controller.h
@@ -44,38 +44,30 @@ namespace Gtkmm2ext {
 
 class LIBGTKMM2EXT_API SliderController : public Gtkmm2ext::PixFader
 {
-  public:
-        SliderController (Gtk::Adjustment* adj, int orientation, int, int);
-	
-        virtual ~SliderController () {}
+	public:
+	SliderController (Gtk::Adjustment* adj, int orientation, int, int);
 
-	void set_value (float);
+	virtual ~SliderController () {}
 
 	Gtk::SpinButton& get_spin_button () { return spin; }
-	
-	bool on_button_press_event (GdkEventButton *ev);
-
 	void set_controllable (boost::shared_ptr<PBD::Controllable> c) { binding_proxy.set_controllable (c); }
 
-  protected:
+	protected:
+	bool on_button_press_event (GdkEventButton *ev);
 	BindingProxy binding_proxy;
-	Gtk::SpinButton     spin;
-	Gtk::Frame          spin_frame;
-	Gtk::HBox           spin_hbox;
-
-	void init ();
+	Gtk::SpinButton spin;
 };
 
 class LIBGTKMM2EXT_API VSliderController : public SliderController
 {
-  public:
-        VSliderController (Gtk::Adjustment *adj, int, int, bool with_numeric = true);
+	public:
+	VSliderController (Gtk::Adjustment *adj, int, int);
 };
 
 class LIBGTKMM2EXT_API HSliderController : public SliderController
 {
-  public:
-	HSliderController (Gtk::Adjustment *adj, int, int, bool with_numeric = true);
+	public:
+	HSliderController (Gtk::Adjustment *adj, int, int);
 };
 
 
diff --git a/libs/gtkmm2ext/slider_controller.cc b/libs/gtkmm2ext/slider_controller.cc
index e3c47f332e..4fd78d095f 100644
--- a/libs/gtkmm2ext/slider_controller.cc
+++ b/libs/gtkmm2ext/slider_controller.cc
@@ -33,17 +33,10 @@ SliderController::SliderController (Gtk::Adjustment *adj, int orientation, int f
 	, spin (*adj, 0, 2)
 {			  
 	spin.set_name ("SliderControllerValue");
-	spin.set_size_request (70,-1); // should be based on font size somehow
 	spin.set_numeric (true);
 	spin.set_snap_to_ticks (false);
 }
 
-void
-SliderController::set_value (float v)
-{
-	adjustment.set_value (v);
-}
-
 bool 
 SliderController::on_button_press_event (GdkEventButton *ev) 
 {
@@ -54,29 +47,12 @@ SliderController::on_button_press_event (GdkEventButton *ev)
 	return PixFader::on_button_press_event (ev);
 }
 
-VSliderController::VSliderController (Gtk::Adjustment *adj, int fader_length, int fader_girth, bool with_numeric)
-
+VSliderController::VSliderController (Gtk::Adjustment *adj, int fader_length, int fader_girth)
 	: SliderController (adj, VERT, fader_length, fader_girth)
 {
-	if (with_numeric) {
-		spin_frame.add (spin);
-		spin_frame.set_shadow_type (Gtk::SHADOW_IN);
-		spin_frame.set_name ("BaseFrame");
-		spin_hbox.pack_start (spin_frame, false, true);
-		// pack_start (spin_hbox, false, false);
-	}
 }
 
-HSliderController::HSliderController (Gtk::Adjustment *adj, int fader_length, int fader_girth,
-				      bool with_numeric)
-	
+HSliderController::HSliderController (Gtk::Adjustment *adj, int fader_length, int fader_girth)
 	: SliderController (adj, HORIZ, fader_length, fader_girth)
 {
-	if (with_numeric) {
-		spin_frame.add (spin);
-		//spin_frame.set_shadow_type (Gtk::SHADOW_IN);
-		spin_frame.set_name ("BaseFrame");
-		spin_hbox.pack_start (spin_frame, false, true);
-		// pack_start (spin_hbox, false, false);
-	}
 }