fix OSX compilation

[ardour.git] / gtk2_ardour / ardour_button.h

diff --git a/gtk2_ardour/ardour_button.h b/gtk2_ardour/ardour_button.h
index 2bfb3c6f010adb1935d5488f1c11741dd935bdff..78c2f5e369ae7f5bed1ab125e78bb9d978a189cb 100644 (file)
--- a/gtk2_ardour/ardour_button.h
+++ b/gtk2_ardour/ardour_button.h
@@ -25,6 +25,7 @@
 #include <gtkmm/action.h>
 
 #include "pbd/signals.h"
+#include "gtkmm2ext/ardour_icon.h"
 #include "gtkmm2ext/binding_proxy.h"
 #include "gtkmm2ext/activatable.h"
 #include "gtkmm2ext/cairo_widget.h"
@@ -40,9 +41,7 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
                unused = 0x10,
                Menu = 0x20,
                Inactive = 0x40, // no _action is defined AND state is not used
-               RecButton = 0x80, // tentative, see commit message
-               RecTapeMode = 0x100, // tentative
-               CloseCross = 0x200, // tentative
+               VectorIcon = 0x80, // tentative, see commit message
        };
 
        static Element default_elements;
@@ -56,7 +55,8 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
        enum Tweaks {
                Square = 0x1,
                TrackHeader = 0x2,
-               unused3 = 0x4,
+               OccasionalText = 0x4,
+               unused4 = 0x8,
        };
 
        Tweaks tweaks() const { return _tweaks; }
@@ -73,6 +73,9 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
        void set_elements (Element);
        void add_elements (Element);
 
+       Gtkmm2ext::ArdourIcon::Icon icon() const { return _icon; }
+       void set_icon (Gtkmm2ext::ArdourIcon::Icon);
+
        void set_corner_radius (float);
 
        void set_text (const std::string&);
@@ -87,8 +90,8 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
        void set_layout_ellipsize_width (int w);
        void set_layout_font (const Pango::FontDescription&);
        void set_text_ellipsize (Pango::EllipsizeMode);
-       
-       sigc::signal<void> signal_led_clicked;
+
+       sigc::signal<void, GdkEventButton*> signal_led_clicked;
        sigc::signal<void> signal_clicked;
 
        boost::shared_ptr<PBD::Controllable> get_controllable() { return binding_proxy.get_controllable(); }
@@ -102,7 +105,9 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
 
        void set_image (const Glib::RefPtr<Gdk::Pixbuf>&);
 
-       void set_fixed_colors (const uint32_t active_color, const uint32_t inactive_color);
+       void set_fixed_colors   (const uint32_t active_color, const uint32_t inactive_color);
+       void set_active_color   (const uint32_t active_color);
+       void set_inactive_color (const uint32_t inactive_color);
 
        void set_fallthrough_to_parent(bool fall) { _fallthrough_to_parent = fall; }
 
@@ -131,6 +136,7 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
        Glib::RefPtr<Gdk::Pixbuf>   _pixbuf;
        std::string                 _text;
        Element                     _elements;
+       Gtkmm2ext::ArdourIcon::Icon _icon;
        Tweaks                      _tweaks;
        BindingProxy                binding_proxy;
 
@@ -169,7 +175,7 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
        bool _distinct_led_click;
        bool _hovering;
        bool _focused;
-       bool _fixed_colors_set;
+       int  _fixed_colors_set;
        bool _fallthrough_to_parent;
        int _layout_ellipsize_width;
        Pango::EllipsizeMode _ellipsis;