X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmidi_channel_selector.h;h=c7c754c2b74ba642fd5825a0b45d5b5233dc3297;hb=2dc3c8b3650266eba09cf7fe53c39c6728d4d5b6;hp=56a3f3b7c44f8b3016c4c016ec40c734dd451cd7;hpb=63ea7b6516dbd7554d1eff6c98de50cf61fc9a72;p=ardour.git

diff --git a/gtk2_ardour/midi_channel_selector.h b/gtk2_ardour/midi_channel_selector.h
index 56a3f3b7c4..c7c754c2b7 100644
--- a/gtk2_ardour/midi_channel_selector.h
+++ b/gtk2_ardour/midi_channel_selector.h
@@ -29,7 +29,8 @@
 #include "gtkmm/button.h"
 #include "gtkmm/radiobutton.h"
 #include "gtkmm/label.h"
-#include "gtkmm2ext/stateful_button.h"
+
+#include "widgets/stateful_button.h"
 
 #include "ardour/types.h"
 
@@ -41,7 +42,7 @@ namespace ARDOUR {
 
 class MidiChannelSelector : public Gtk::Table
 {
-  public:
+public:
 	MidiChannelSelector(int n_rows = 4, int n_columns = 4, int start_row = 0, int start_column = 0);
 	virtual ~MidiChannelSelector() = 0;
 
@@ -50,25 +51,25 @@ class MidiChannelSelector : public Gtk::Table
 	void set_channel_colors(const uint32_t new_channel_colors[16]);
 	void set_default_channel_color();
 
-  protected:
+protected:
 	virtual void button_toggled(Gtk::ToggleButton* button, uint8_t button_nr) = 0;
-	Gtk::Label                      _button_labels[4][4];
-	Gtkmm2ext::StatefulToggleButton _buttons[4][4];
-	int                             _recursion_counter;
+	Gtk::Label                          _button_labels[4][4];
+	ArdourWidgets::StatefulToggleButton _buttons[4][4];
+	int                                 _recursion_counter;
 
-	bool              was_clicked (GdkEventButton*);
+	bool was_clicked (GdkEventButton*);
 };
 
 class SingleMidiChannelSelector : public MidiChannelSelector
 {
-  public:
+public:
 	SingleMidiChannelSelector(uint8_t active_channel = 0);
 
 	uint8_t get_active_channel() const { return _active_channel; }
 
 	sigc::signal<void, uint8_t> channel_selected;
 
-  protected:
+protected:
 	virtual void button_toggled(Gtk::ToggleButton* button, uint8_t button_nr);
 
 	Gtk::ToggleButton* _last_active_button;
@@ -77,9 +78,9 @@ class SingleMidiChannelSelector : public MidiChannelSelector
 
 class MidiMultipleChannelSelector : public MidiChannelSelector
 {
-  public:
+public:
 	MidiMultipleChannelSelector(ARDOUR::ChannelMode mode = ARDOUR::FilterChannels,
-				uint16_t initial_selection = 0xFFFF);
+			uint16_t initial_selection = 0xFFFF);
 
 	virtual ~MidiMultipleChannelSelector();
 
@@ -100,7 +101,7 @@ class MidiMultipleChannelSelector : public MidiChannelSelector
 	uint16_t get_selected_channels() const;
 	void     set_selected_channels(uint16_t selected_channels);
 
-  protected:
+protected:
 	ARDOUR::ChannelMode _channel_mode;
 	ARDOUR::NoteMode    _note_mode;
 
@@ -118,14 +119,14 @@ class MidiMultipleChannelSelector : public MidiChannelSelector
 
 class MidiChannelSelectorWindow : public ArdourWindow, public PBD::ScopedConnectionList
 {
-  public:
+public:
 	MidiChannelSelectorWindow (boost::shared_ptr<ARDOUR::MidiTrack>);
 	~MidiChannelSelectorWindow ();
 
 	void set_channel_colors (const uint32_t new_channel_colors[16]);
 	void set_default_channel_color();
 
-  private:
+private:
 	boost::shared_ptr<ARDOUR::MidiTrack> track;
 	std::vector<Gtk::ToggleButton*> playback_buttons;
 	std::vector<Gtk::ToggleButton*> capture_buttons;