remove duplicate/wrong includes in last commit.

[ardour.git] / libs / gtkmm2ext / bindable_button.cc

diff --git a/libs/gtkmm2ext/bindable_button.cc b/libs/gtkmm2ext/bindable_button.cc
index c2516a9219b1ca8fc6c8aab8e3c4f70123f89c92..3c3cad6e46ddd04def011484da23686568cfbe25 100644 (file)
--- a/libs/gtkmm2ext/bindable_button.cc
+++ b/libs/gtkmm2ext/bindable_button.cc
@@ -32,8 +32,7 @@ using namespace Gtkmm2ext;
 using namespace std;
 
 BindableToggleButton::BindableToggleButton (MIDI::Controllable *mc)
-       : ToggleButton (),
-         prompter (Gtk::WIN_POS_MOUSE, 30000, false),
+       : prompter (Gtk::WIN_POS_MOUSE, 30000, false),
          midi_control (mc),
          bind_button (2),
          bind_statemask (Gdk::CONTROL_MASK)
@@ -43,7 +42,7 @@ BindableToggleButton::BindableToggleButton (MIDI::Controllable *mc)
 }
 
 BindableToggleButton::BindableToggleButton(MIDI::Controllable *mc, const string &label)
-       : ToggleButton (label),
+       : StatefulButton (label),
          prompter (Gtk::WIN_POS_MOUSE, 30000, false),
          midi_control (mc),
          bind_button (2),
@@ -56,8 +55,6 @@ BindableToggleButton::BindableToggleButton(MIDI::Controllable *mc, const string
 void
 BindableToggleButton::init_events ()
 {
-       signal_button_press_event().connect (mem_fun (*this, &BindableToggleButton::button_press));
-
        prompter.signal_unmap_event().connect (mem_fun (*this, &BindableToggleButton::prompter_hiding));
        
        prompting = false;
@@ -92,20 +89,7 @@ BindableToggleButton::midi_learn()
        }
 }
 
-
-gint
-BindableToggleButton::button_press (GdkEventButton *ev)
-{
-       
-       if ((ev->state & bind_statemask) && ev->button == bind_button) { 
-               midi_learn ();
-               return TRUE;
-       }
-
-       return FALSE;
-}
-
-gint
+bool
 BindableToggleButton::prompter_hiding (GdkEventAny *ev)
 {
        if (unprompting) {
@@ -115,7 +99,7 @@ BindableToggleButton::prompter_hiding (GdkEventAny *ev)
                unprompting = false;
        }
        
-       return FALSE;
+       return false;
 }