2 files changed, 70 insertions, 14 deletions

diff --git a/libs/gtkmm2ext/gtkmm2ext/bindable_button.h b/libs/gtkmm2ext/gtkmm2ext/bindable_button.h
index 1936125405..845d3fa49e 100644
--- a/libs/gtkmm2ext/gtkmm2ext/bindable_button.h
+++ b/libs/gtkmm2ext/gtkmm2ext/bindable_button.h
@@ -30,15 +30,44 @@ namespace PBD {
 	class Controllable;
 }
 
-class BindableToggleButton : public Gtk::ToggleButton
+class BindableToggleButton : public Gtkmm2ext::StatefulToggleButton
 {
    public:
 	BindableToggleButton (PBD::Controllable& c) : binding_proxy (c) {}
-	explicit BindableToggleButton (PBD::Controllable& c, const std::string &label) : Gtk::ToggleButton (label), binding_proxy (c) {}
+
+	explicit BindableToggleButton (PBD::Controllable& c, const std::string &label)
+		: Gtkmm2ext::StatefulToggleButton (label), binding_proxy (c) {}
+
 	virtual ~BindableToggleButton() {}
 	
 	bool on_button_press_event (GdkEventButton *ev) {
-		return binding_proxy.button_press_handler (ev);
+		if (!binding_proxy.button_press_handler (ev)) {
+			return false;
+		} else {
+			return true;
+		}
+	}
+
+  private:
+	BindingProxy binding_proxy;
+};
+
+class BindableButton : public Gtkmm2ext::StatefulButton
+{
+   public:
+	BindableButton (PBD::Controllable& c) : binding_proxy (c) {}
+
+	explicit BindableButton (PBD::Controllable& c, const std::string &label)
+		: Gtkmm2ext::StatefulButton (label), binding_proxy (c) {}
+
+	~BindableButton() {}
+	
+	bool on_button_press_event (GdkEventButton *ev) {
+		if (!binding_proxy.button_press_handler (ev)) {
+			return false;
+		} else {
+			return true;
+		}
 	}
 
   private:
diff --git a/libs/gtkmm2ext/gtkmm2ext/stateful_button.h b/libs/gtkmm2ext/gtkmm2ext/stateful_button.h
index f684903836..fc62bd2999 100644
--- a/libs/gtkmm2ext/gtkmm2ext/stateful_button.h
+++ b/libs/gtkmm2ext/gtkmm2ext/stateful_button.h
@@ -27,28 +27,55 @@
 
 namespace Gtkmm2ext {
 
-class StatefulButton : public Gtk::Button
+class StateButton 
 {
    public:
-	StatefulButton();
-	explicit StatefulButton(const std::string &label);
-	virtual ~StatefulButton() {}
+	StateButton();
+	virtual ~StateButton() {}
 
 	void set_colors (const std::vector<Gdk::Color>& colors);
-	void set_state (int);
-	int  get_state () { return current_state; }
-	void set_active (bool yn) {
-		set_state (yn ? 1 : 0);
-	}
-	
+	void set_visual_state (int);
+	int  get_visual_state () { return visual_state; }
 
   protected:
 	std::vector<Gdk::Color> colors;
-	int current_state;
+	int  visual_state;
 	Gdk::Color saved_bg;
 	bool have_saved_bg;
+	
+	virtual void bg_modify (Gtk::StateType, Gdk::Color) = 0;
+};
+
+
+class StatefulToggleButton : public StateButton, public Gtk::ToggleButton
+{
+   public:
+	StatefulToggleButton() {}
+	explicit StatefulToggleButton(const std::string &label) : Gtk::ToggleButton (label) {}
+	~StatefulToggleButton() {}
+
+  protected:
+	void on_realize ();
+	void on_toggled ();
+
+	void bg_modify (Gtk::StateType state, Gdk::Color col) { 
+		modify_bg (state, col);
+	}
+};
 
+class StatefulButton : public StateButton, public Gtk::Button
+{
+   public:
+	StatefulButton() {}
+	explicit StatefulButton(const std::string &label) : Gtk::Button (label) {}
+	virtual ~StatefulButton() {}
+
+  protected:
 	void on_realize ();
+
+	void bg_modify (Gtk::StateType state, Gdk::Color col) { 
+		modify_bg (state, col);
+	}
 };
 
 };