changes to support making RouteUI and its children and relations able to switch the...

[ardour.git] / libs / gtkmm2ext / gtkmm2ext / slider_controller.h

diff --git a/libs/gtkmm2ext/gtkmm2ext/slider_controller.h b/libs/gtkmm2ext/gtkmm2ext/slider_controller.h
index 8054fdd1b7ae93a61dcea06b10e6f2a0c063d53f..9919093eaebfe0e68ab8e5517c34d832d59d69ae 100644 (file)
--- a/libs/gtkmm2ext/gtkmm2ext/slider_controller.h
+++ b/libs/gtkmm2ext/gtkmm2ext/slider_controller.h
@@ -14,7 +14,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #ifndef __gtkmm2ext_slider_controller_h__
@@ -22,7 +21,7 @@
 
 #include <gtkmm.h>
 #include <gtkmm2ext/popup.h>
-#include <gtkmm2ext/pixscroller.h>
+#include <gtkmm2ext/pixfader.h>
 #include <gtkmm2ext/binding_proxy.h>
 
 namespace Gtkmm2ext {
@@ -35,13 +34,12 @@ namespace PBD {
 
 namespace Gtkmm2ext {
 
-class SliderController : public Gtkmm2ext::PixScroller
+class SliderController : public Gtkmm2ext::PixFader
 {
   public:
-       SliderController (Glib::RefPtr<Gdk::Pixbuf> slider,
-                         Glib::RefPtr<Gdk::Pixbuf> rail,
-                         Gtk::Adjustment* adj,
-                         PBD::Controllable&,
+       SliderController (Glib::RefPtr<Gdk::Pixbuf> image,
+                         Gtk::Adjustment* adj, int orientation,
+                         PBD::Controllable*,
                          bool with_numeric = true);
 
         virtual ~SliderController () {}
@@ -50,9 +48,9 @@ class SliderController : public Gtkmm2ext::PixScroller
 
        Gtk::SpinButton& get_spin_button () { return spin; }
        
-       bool on_button_press_event (GdkEventButton *ev) {
-               return binding_proxy.button_press_handler (ev);
-       }
+       bool on_button_press_event (GdkEventButton *ev);
+
+       void set_controllable (PBD::Controllable* c) { binding_proxy.set_controllable (c); }
 
   protected:
        BindingProxy binding_proxy;
@@ -66,20 +64,18 @@ class SliderController : public Gtkmm2ext::PixScroller
 class VSliderController : public SliderController
 {
   public:
-       VSliderController (Glib::RefPtr<Gdk::Pixbuf> slider,
-                          Glib::RefPtr<Gdk::Pixbuf> rail,
+       VSliderController (Glib::RefPtr<Gdk::Pixbuf> image,
                           Gtk::Adjustment *adj,
-                          PBD::Controllable&,
+                          PBD::Controllable*,
                           bool with_numeric = true);
 };
 
 class HSliderController : public SliderController
 {
   public:
-       HSliderController (Glib::RefPtr<Gdk::Pixbuf> slider,
-                          Glib::RefPtr<Gdk::Pixbuf> rail,
+       HSliderController (Glib::RefPtr<Gdk::Pixbuf> image,
                           Gtk::Adjustment *adj,
-                          PBD::Controllable&,
+                          PBD::Controllable*,
                           bool with_numeric = true);
 };