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
This commit is contained in:
Paul Davis 2012-02-03 18:49:43 +00:00
parent c21c9e6662
commit 1f0f5e89bb
6 changed files with 23 additions and 20 deletions

View file

@ -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;