diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2012-02-03 18:49:43 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-02-03 18:49:43 +0000 |
commit | 1f0f5e89bbbb1eaaad5e672d249c4d127799bb42 (patch) | |
tree | acf39b31305eb6c31616be613ec4cf861d46148e /gtk2_ardour/button_joiner.h | |
parent | c21c9e666286529fbef0539402367b8787b9964b (diff) |
separate header dependencies on button joiner, and make each button joiner look up the right color for the type of buttons it contains
git-svn-id: svn://localhost/ardour2/branches/3.0@11440 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/button_joiner.h')
-rw-r--r-- | gtk2_ardour/button_joiner.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gtk2_ardour/button_joiner.h b/gtk2_ardour/button_joiner.h index b3913ef20d..1f0fc573ca 100644 --- a/gtk2_ardour/button_joiner.h +++ b/gtk2_ardour/button_joiner.h @@ -10,7 +10,7 @@ class ButtonJoiner : public CairoWidget, public Gtkmm2ext::Activatable { public: - ButtonJoiner (Gtk::Widget&, Gtk::Widget&); + ButtonJoiner (const std::string&, Gtk::Widget&, Gtk::Widget&); ~ButtonJoiner (); void set_related_action (Glib::RefPtr<Gtk::Action>); @@ -28,11 +28,11 @@ class ButtonJoiner : public CairoWidget, public Gtkmm2ext::Activatable { void action_toggled (); private: - Gtk::Widget& left; - Gtk::Widget& right; - Gtk::HBox packer; + Gtk::Widget& left; + Gtk::Widget& right; + Gtk::HBox packer; Gtk::Alignment align; - + std::string name; cairo_pattern_t* active_fill_pattern; cairo_pattern_t* inactive_fill_pattern; |