Remove "Close" button from import-dialog (prefer WM close button)

diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc
index 6a5d933f5e4410b0314ce0b7ade0dbc227f62f84..c1662515ce42afc890fdaaf00c3dc0c4632e9b71 100644 (file)
--- a/gtk2_ardour/sfdb_ui.cc
+++ b/gtk2_ardour/sfdb_ui.cc
@@ -606,7 +606,6 @@ SoundFileBrowser::SoundFileBrowser (string title, ARDOUR::Session* s, bool persi
        , _status (0)
        , _done (false)
        , import_button (_("Import"))
-       , close_button (Stock::CLOSE)
        , gm (0)
 {
 
@@ -782,14 +781,11 @@ SoundFileBrowser::SoundFileBrowser (string title, ARDOUR::Session* s, bool persi
        Gtk::HButtonBox* button_box = manage (new HButtonBox);
 
        button_box->set_layout (BUTTONBOX_END);
-       button_box->pack_start (close_button, false, false);
-       close_button.signal_clicked().connect (sigc::bind (sigc::mem_fun (*this, &SoundFileBrowser::do_something), RESPONSE_CLOSE));
 
        button_box->pack_start (import_button, false, false);
        import_button.signal_clicked().connect (sigc::bind (sigc::mem_fun (*this, &SoundFileBrowser::do_something), RESPONSE_OK));
 
        Gtkmm2ext::UI::instance()->set_tip (import_button, _("Press to import selected files"));
-       Gtkmm2ext::UI::instance()->set_tip (close_button, _("Press to close this window without importing any files"));
 
        vpacker.pack_end (*button_box, false, false);
 

diff --git a/gtk2_ardour/sfdb_ui.h b/gtk2_ardour/sfdb_ui.h
index 6c32474a911972a98b2a3c27974eccfeeee83818..be734cfb823a55a2997290c8de4fd8df0d302f91 100644 (file)
--- a/gtk2_ardour/sfdb_ui.h
+++ b/gtk2_ardour/sfdb_ui.h
@@ -216,7 +216,6 @@ class SoundFileBrowser : public ArdourWindow
        Gtk::VBox vpacker;
 
        Gtk::Button import_button;
-       Gtk::Button close_button;
 
        static std::string persistent_folder;