Remove the PaddedButton widget as it broke rendering in some cases.

9 files changed, 0 insertions, 41 deletions

diff --git a/gtk2_ardour/clearlooks.rc.in b/gtk2_ardour/clearlooks.rc.in
index 5c51ace29f..e2a04634a1 100644
--- a/gtk2_ardour/clearlooks.rc.in
+++ b/gtk2_ardour/clearlooks.rc.in
@@ -985,11 +985,6 @@ style "ardour_button" ="default_button"
 	ythickness = 1
 }
 
-style "padded_button" = "default_button"
-{
-	xthickness = 8
-}
-
 style "tooltip" = "medium_text"
 {
 	fg[NORMAL] = @fg_tooltip
@@ -1032,8 +1027,6 @@ class "GtkCheckButton" style:highest "ardour_button"
 class "GtkArrow" style:highest "tearoff_arrow"
 class "GtkProgressBar" style:highest "ardour_progressbars"
 
-
-widget "*PaddedButton" style:highest "padded_button"
 widget "*VerboseCanvasCursor" style:highest "verbose_canvas_cursor"
 widget "*MarkerText" style:highest "marker_text"
 widget "*ArdourContextMenu*" style:highest "default_menu"
diff --git a/gtk2_ardour/export_dialog.cc b/gtk2_ardour/export_dialog.cc
index 8d9c6ff24b..ad8873d6dc 100644
--- a/gtk2_ardour/export_dialog.cc
+++ b/gtk2_ardour/export_dialog.cc
@@ -129,8 +129,6 @@ ExportDialog::init ()
 	export_button = add_button (_("Export"), RESPONSE_FAST);
 	set_default_response (RESPONSE_FAST);
 
-	list_files_button.set_name ("PaddedButton");
-
 	cancel_button->signal_clicked().connect (sigc::mem_fun (*this, &ExportDialog::close_dialog));
 	export_button->signal_clicked().connect (sigc::mem_fun (*this, &ExportDialog::do_export));
 
diff --git a/gtk2_ardour/export_filename_selector.cc b/gtk2_ardour/export_filename_selector.cc
index 831b75ef02..2eb6540e81 100644
--- a/gtk2_ardour/export_filename_selector.cc
+++ b/gtk2_ardour/export_filename_selector.cc
@@ -61,10 +61,6 @@ ExportFilenameSelector::ExportFilenameSelector () :
 
 	path_entry.set_activates_default ();
 
-	date_format_combo.set_name ("PaddedButton");
-	time_format_combo.set_name ("PaddedButton");
-	browse_button.set_name ("PaddedButton");
-
 	label_sizegroup = Gtk::SizeGroup::create (Gtk::SIZE_GROUP_HORIZONTAL);
 	label_sizegroup->add_widget (label_label);
 	label_sizegroup->add_widget (path_label);
diff --git a/gtk2_ardour/export_format_selector.cc b/gtk2_ardour/export_format_selector.cc
index a2ba3f352f..407465605e 100644
--- a/gtk2_ardour/export_format_selector.cc
+++ b/gtk2_ardour/export_format_selector.cc
@@ -37,11 +37,6 @@ ExportFormatSelector::ExportFormatSelector () :
 	pack_start (remove_button, false, false, 3);
 	pack_start (new_button, false, false, 3);
 
-	format_combo.set_name ("PaddedButton");
-	edit_button.set_name ("PaddedButton");
-	remove_button.set_name ("PaddedButton");
-	new_button.set_name ("PaddedButton");
-
 	edit_button.signal_clicked().connect (sigc::hide_return (sigc::bind (sigc::mem_fun (*this, &ExportFormatSelector::open_edit_dialog), false)));
 	remove_button.signal_clicked().connect (sigc::bind (sigc::mem_fun (*this, &ExportFormatSelector::remove_format), true));
 	new_button.signal_clicked().connect (sigc::mem_fun (*this, &ExportFormatSelector::add_new_format));
diff --git a/gtk2_ardour/export_preset_selector.cc b/gtk2_ardour/export_preset_selector.cc
index 6adf5a45be..3e3b0d0b15 100644
--- a/gtk2_ardour/export_preset_selector.cc
+++ b/gtk2_ardour/export_preset_selector.cc
@@ -41,11 +41,6 @@ ExportPresetSelector::ExportPresetSelector () :
 	pack_start (remove_button, false, false, 6);
 	pack_start (new_button, false, false, 0);
 
-	entry.set_name ("PaddedButton");
-	save_button.set_name ("PaddedButton");
-	remove_button.set_name ("PaddedButton");
-	new_button.set_name ("PaddedButton");
-
 	save_button.set_sensitive (false);
 	remove_button.set_sensitive (false);
 	new_button.set_sensitive (false);
diff --git a/gtk2_ardour/export_timespan_selector.cc b/gtk2_ardour/export_timespan_selector.cc
index 83f8a8f4aa..9a294aff1b 100644
--- a/gtk2_ardour/export_timespan_selector.cc
+++ b/gtk2_ardour/export_timespan_selector.cc
@@ -78,7 +78,6 @@ ExportTimespanSelector::ExportTimespanSelector (ARDOUR::Session * session, Profi
 
 	time_format_list = Gtk::ListStore::create (time_format_cols);
 	time_format_combo.set_model (time_format_list);
-	time_format_combo.set_name ("PaddedButton");
 
 	iter = time_format_list->append();
 	row = *iter;
diff --git a/gtk2_ardour/export_video_dialog.cc b/gtk2_ardour/export_video_dialog.cc
index 98f5306ad0..41b7872395 100644
--- a/gtk2_ardour/export_video_dialog.cc
+++ b/gtk2_ardour/export_video_dialog.cc
@@ -150,7 +150,6 @@ ExportVideoDialog::ExportVideoDialog ()
 	path_hbox->pack_start (*l, false, false, 2);
 	vbox->pack_start (*path_hbox, false, false, 2);
 
-	insnd_combo.set_name ("PaddedButton");
 	insnd_combo.append_text (string_compose (_("from the %1 session's start to the session's end"), PROGRAM_NAME));
 	outfn_path_entry.set_width_chars(38);
 
@@ -202,7 +201,6 @@ ExportVideoDialog::ExportVideoDialog ()
 	t->attach (debug_checkbox, 0, 4, ty, ty+1); ty++;
 #endif
 
-	preset_combo.set_name ("PaddedButton");
 	preset_combo.append_text("none");
 	preset_combo.append_text("dvd-mp2");
 	preset_combo.append_text("dvd-NTSC");
@@ -214,7 +212,6 @@ ExportVideoDialog::ExportVideoDialog ()
 	preset_combo.append_text("webm");
 	preset_combo.append_text("you-tube");
 
-	audio_codec_combo.set_name ("PaddedButton");
 	audio_codec_combo.append_text(_("(default for format)"));
 	audio_codec_combo.append_text("ac3");
 	audio_codec_combo.append_text("aac");
@@ -223,7 +220,6 @@ ExportVideoDialog::ExportVideoDialog ()
 	audio_codec_combo.append_text("mp2");
 	audio_codec_combo.append_text("pcm_s16le");
 
-	video_codec_combo.set_name ("PaddedButton");
 	video_codec_combo.append_text(_("(default for format)"));
 	video_codec_combo.append_text("flv");
 	video_codec_combo.append_text("libtheora");
@@ -234,7 +230,6 @@ ExportVideoDialog::ExportVideoDialog ()
 	video_codec_combo.append_text("vpx (webm)");
 	video_codec_combo.append_text("copy");
 
-	audio_bitrate_combo.set_name ("PaddedButton");
 	audio_bitrate_combo.append_text(_("(default)"));
 	audio_bitrate_combo.append_text("64k");
 	audio_bitrate_combo.append_text("128k");
@@ -242,12 +237,10 @@ ExportVideoDialog::ExportVideoDialog ()
 	audio_bitrate_combo.append_text("256k");
 	audio_bitrate_combo.append_text("320k");
 
-	audio_samplerate_combo.set_name ("PaddedButton");
 	audio_samplerate_combo.append_text("22050");
 	audio_samplerate_combo.append_text("44100");
 	audio_samplerate_combo.append_text("48000");
 
-	video_bitrate_combo.set_name ("PaddedButton");
 	video_bitrate_combo.append_text(_("(default)"));
 	video_bitrate_combo.append_text(_("(retain)"));
 	video_bitrate_combo.append_text("200k");
@@ -256,7 +249,6 @@ ExportVideoDialog::ExportVideoDialog ()
 	video_bitrate_combo.append_text("5000k");
 	video_bitrate_combo.append_text("8000k");
 
-	fps_combo.set_name ("PaddedButton");
 	fps_combo.append_text("23.976");
 	fps_combo.append_text("24");
 	fps_combo.append_text("24.976");
@@ -266,7 +258,6 @@ ExportVideoDialog::ExportVideoDialog ()
 	fps_combo.append_text("59.94");
 	fps_combo.append_text("60");
 
-	aspect_combo.set_name ("PaddedButton");
 	aspect_combo.append_text("4:3");
 	aspect_combo.append_text("16:9");
 
diff --git a/gtk2_ardour/transcode_video_dialog.cc b/gtk2_ardour/transcode_video_dialog.cc
index 1274685d82..20dcbb8748 100644
--- a/gtk2_ardour/transcode_video_dialog.cc
+++ b/gtk2_ardour/transcode_video_dialog.cc
@@ -95,7 +95,6 @@ TranscodeVideoDialog::TranscodeVideoDialog (Session* s, std::string infile)
 	path_hbox->pack_start (path_label, false, false, 3);
 	path_hbox->pack_start (path_entry, true, true, 3);
 	path_hbox->pack_start (browse_button, false, false, 3);
-	browse_button.set_name ("PaddedButton");
 
 	path_entry.set_width_chars(38);
 	height_spinner.set_sensitive(false);
@@ -181,8 +180,6 @@ TranscodeVideoDialog::TranscodeVideoDialog (Session* s, std::string infile)
 	l->set_use_markup ();
 	options_box->pack_start (*l, false, true, 4);
 
-	video_combo.set_name ("PaddedButton");
-
 	if (ffok) {
 		video_combo.append_text(_("Reference from Current Location (Previously Transcoded Files Only)"));
 		video_combo.append_text(_("Import/Transcode Video to Session"));
@@ -226,7 +223,6 @@ TranscodeVideoDialog::TranscodeVideoDialog (Session* s, std::string infile)
 
 	l = manage (new Label (_("Scale Video: Width = "), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
 	t->attach (*l, 0, 1, 0, 1);
-	scale_combo.set_name ("PaddedButton");
 	t->attach (scale_combo, 1, 2, 0, 1);
 	t->attach (aspect_checkbox, 2, 3, 0, 1);
 	t->attach (height_spinner, 3, 4, 0, 1);
@@ -253,7 +249,6 @@ TranscodeVideoDialog::TranscodeVideoDialog (Session* s, std::string infile)
 
 	l = manage (new Label (_("Extract Audio:"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
 	t->attach (*l, 0, 1, 2, 3);
-	audio_combo.set_name ("PaddedButton");
 	t->attach (audio_combo, 1, 4, 2, 3);
 	t->attach (ltc_detect, 1, 4, 3, 4);
 	if (as.size() == 0) {
diff --git a/gtk2_ardour/video_server_dialog.cc b/gtk2_ardour/video_server_dialog.cc
index 227671aa56..2bd814b7ac 100644
--- a/gtk2_ardour/video_server_dialog.cc
+++ b/gtk2_ardour/video_server_dialog.cc
@@ -74,13 +74,10 @@ VideoServerDialog::VideoServerDialog (Session* s)
 	HBox* docroot_hbox = manage (new HBox);
 
 	path_entry.set_width_chars(38);
-	path_browse_button.set_name ("PaddedButton");
 	path_entry.set_text("/usr/bin/harvid");
 	docroot_entry.set_width_chars(38);
 	docroot_entry.set_text(Config->get_video_server_docroot());
-	docroot_browse_button.set_name ("PaddedButton");
 
-	listenaddr_combo.set_name ("PaddedButton");
 #ifndef __APPLE__
 	/* Note: on OSX icsd is not able to bind to IPv4 localhost */
 	listenaddr_combo.append_text("127.0.0.1");