use ardour button rather than gtk::button in transport master widget

2 files changed, 10 insertions, 6 deletions

diff --git a/gtk2_ardour/transport_masters_dialog.cc b/gtk2_ardour/transport_masters_dialog.cc
index 16648c3322..9219cf16a8 100644
--- a/gtk2_ardour/transport_masters_dialog.cc
+++ b/gtk2_ardour/transport_masters_dialog.cc
@@ -30,6 +30,7 @@
 #include "ardour/transport_master_manager.h"
 
 #include "widgets/tooltips.h"
+#include "widgets/ardour_icon.h"
 
 #include "gtkmm2ext/utils.h"
 #include "gtkmm2ext/gui_thread.h"
@@ -235,7 +236,8 @@ TransportMastersWidget::rebuild ()
 		}
 
 		if (r->tm->removeable()) {
-			table.attach (r->remove_button, col, col+1, n, n+1); ++col;
+			table.attach (r->remove_button, col, col+1, n, n+1, SHRINK, EXPAND|FILL);
+			++col;
 		} else {
 			col++;
 		}
@@ -247,7 +249,7 @@ TransportMastersWidget::rebuild ()
 		r->use_button.signal_toggled().connect (sigc::mem_fun (*r, &TransportMastersWidget::Row::use_button_toggled));
 		r->collect_button.signal_toggled().connect (sigc::mem_fun (*r, &TransportMastersWidget::Row::collect_button_toggled));
 		r->request_options.signal_button_press_event().connect (sigc::mem_fun (*r, &TransportMastersWidget::Row::request_option_press), false);
-		r->remove_button.signal_clicked().connect (sigc::mem_fun (*r, &TransportMastersWidget::Row::remove_clicked));
+		r->remove_button.signal_clicked.connect (sigc::mem_fun (*r, &TransportMastersWidget::Row::remove_clicked));
 
 		if (ttm) {
 			r->sclock_synced_button.signal_toggled().connect (sigc::mem_fun (*r, &TransportMastersWidget::Row::sync_button_toggled));
@@ -320,10 +322,10 @@ TransportMastersWidget::update_usability ()
 TransportMastersWidget::Row::Row (TransportMastersWidget& p)
 	: parent (p)
 	, request_option_menu (0)
-	, remove_button (X_("x"))
 	, name_editor (0)
 	, save_when (0)
 {
+	remove_button.set_icon (ArdourIcon::CloseCross);
 }
 
 TransportMastersWidget::Row::~Row ()
@@ -436,7 +438,7 @@ TransportMastersWidget::Row::prop_change (PropertyChange what_changed)
 	}
 
 	if (what_changed.contains (Properties::allowed_transport_requests)) {
-		request_options.set_label (tm->allowed_request_string());
+		request_options.set_text (tm->allowed_request_string());
 	}
 }
 
diff --git a/gtk2_ardour/transport_masters_dialog.h b/gtk2_ardour/transport_masters_dialog.h
index 5a3add7d84..ddc5f5b699 100644
--- a/gtk2_ardour/transport_masters_dialog.h
+++ b/gtk2_ardour/transport_masters_dialog.h
@@ -30,6 +30,8 @@
 #include <gtkmm/entry.h>
 #include <gtkmm/treestore.h>
 
+#include "widgets/ardour_button.h"
+
 #include "ardour_window.h"
 
 namespace Gtk {
@@ -87,9 +89,9 @@ class TransportMastersWidget : public Gtk::VBox, public ARDOUR::SessionHandlePtr
 		Gtk::ComboBoxText port_combo;
 		Gtk::CheckButton sclock_synced_button;
 		Gtk::CheckButton fr2997_button;
-		Gtk::Button request_options;
+		ArdourWidgets::ArdourButton request_options;
 		Gtk::Menu* request_option_menu;
-		Gtk::Button remove_button;
+		ArdourWidgets::ArdourButton remove_button;
 		FloatingTextEntry* name_editor;
 		samplepos_t save_when;