visibility macros and flush() added to SrcFileSource; merge with master

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

diff --git a/libs/gtkmm2ext/gtkmm2ext/bindable_button.h b/libs/gtkmm2ext/gtkmm2ext/bindable_button.h
index 193612540551db5d4873cc4d4aa6b2a56df82f91..cf74d3aca048ecb3505189c8ed38e0a56976350c 100644 (file)
--- a/libs/gtkmm2ext/gtkmm2ext/bindable_button.h
+++ b/libs/gtkmm2ext/gtkmm2ext/bindable_button.h
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #ifndef __bindable_button_h__
@@ -23,23 +22,63 @@
 
 #include <string>
 
-#include <gtkmm2ext/stateful_button.h>
-#include "binding_proxy.h"
+#include "pbd/signals.h"
+
+#include "gtkmm2ext/visibility.h"
+#include "gtkmm2ext/stateful_button.h"
+#include "gtkmm2ext/binding_proxy.h"
 
 namespace PBD {
        class Controllable;
 }
 
-class BindableToggleButton : public Gtk::ToggleButton
+class LIBGTKMM2EXT_API 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) {}
+       BindableToggleButton (const std::string &label)
+               : Gtkmm2ext::StatefulToggleButton (label) {}
+       BindableToggleButton () {}
+
        virtual ~BindableToggleButton() {}
        
        bool on_button_press_event (GdkEventButton *ev) {
-               return binding_proxy.button_press_handler (ev);
+               if (!binding_proxy.button_press_handler (ev)) {
+                       StatefulToggleButton::on_button_press_event (ev);
+                       return false;
+               } else {
+                       return true;
+               }
        }
+       
+       boost::shared_ptr<PBD::Controllable> get_controllable() { return binding_proxy.get_controllable(); }
+       void set_controllable (boost::shared_ptr<PBD::Controllable> c);
+        void watch ();
+
+  protected:
+        void controllable_changed ();
+        PBD::ScopedConnection watch_connection;
+
+  private:
+       BindingProxy binding_proxy;
+};
+
+class LIBGTKMM2EXT_API BindableButton : public Gtkmm2ext::StatefulButton
+{
+   public:
+       BindableButton (boost::shared_ptr<PBD::Controllable> c) : binding_proxy (c) {}
+       ~BindableButton() {}
+       
+       bool on_button_press_event (GdkEventButton *ev) {
+               if (!binding_proxy.button_press_handler (ev)) {
+                       StatefulButton::on_button_press_event (ev);
+                       return false;
+               } else {
+                       return true;
+               }
+       }
+
+       boost::shared_ptr<PBD::Controllable> get_controllable() { return binding_proxy.get_controllable(); }
+       void set_controllable (boost::shared_ptr<PBD::Controllable> c) { binding_proxy.set_controllable (c); }
 
   private:
        BindingProxy binding_proxy;