Merge branch 'master' into windows

[ardour.git] / gtk2_ardour / bundle_manager.cc

diff --git a/gtk2_ardour/bundle_manager.cc b/gtk2_ardour/bundle_manager.cc
index e9cddbd7540265cdefee778955d3d62acf6df0b3..035046c10b6b4eb4313ce5395f50d7ed888b00a2 100644 (file)
--- a/gtk2_ardour/bundle_manager.cc
+++ b/gtk2_ardour/bundle_manager.cc
@@ -115,7 +115,6 @@ BundleEditorMatrix::add_channel (boost::shared_ptr<Bundle> b, DataType t)
        if (b == _bundle) {
 
                NameChannelDialog d;
-               d.set_position (Gtk::WIN_POS_MOUSE);
 
                if (d.run () != Gtk::RESPONSE_ACCEPT) {
                        return;
@@ -162,7 +161,6 @@ void
 BundleEditorMatrix::rename_channel (BundleChannel bc)
 {
        NameChannelDialog d (bc.bundle, bc.channel);
-       d.set_position (Gtk::WIN_POS_MOUSE);
 
        if (d.run () != Gtk::RESPONSE_ACCEPT) {
                return;
@@ -288,7 +286,7 @@ BundleManager::BundleManager (Session* session)
        edit_button.set_image (*Gtk::manage (new Gtk::Image (Gtk::Stock::EDIT, Gtk::ICON_SIZE_BUTTON)));
        edit_button.signal_clicked().connect (sigc::mem_fun (*this, &BundleManager::edit_clicked));
        buttons->pack_start (edit_button, false, false);
-       delete_button.set_image (*Gtk::manage (new Gtk::Image (Gtk::Stock::DELETE, Gtk::ICON_SIZE_BUTTON)));
+       delete_button.set_image (*Gtk::manage (new Gtk::Image (Gtk::StockID(GTK_STOCK_DELETE), Gtk::ICON_SIZE_BUTTON)));
        delete_button.signal_clicked().connect (sigc::mem_fun (*this, &BundleManager::delete_clicked));
        buttons->pack_start (delete_button, false, false);