Remove internal edit mode and add "content" tool.

[ardour.git] / gtk2_ardour / ardour_window.cc

diff --git a/gtk2_ardour/ardour_window.cc b/gtk2_ardour/ardour_window.cc
index 532d9828fe4259825bfa1126bc852ca07dac1fbf..6b325aca8534325d9f73fb96c52fdeb53e6a937d 100644 (file)
--- a/gtk2_ardour/ardour_window.cc
+++ b/gtk2_ardour/ardour_window.cc
@@ -30,6 +30,7 @@
 using namespace std;
 using namespace Gtk;
 using namespace Gtkmm2ext;
+using namespace ARDOUR_UI_UTILS;
 
 ArdourWindow::ArdourWindow (string title)
        : Window ()
@@ -51,6 +52,7 @@ ArdourWindow::ArdourWindow (Gtk::Window& parent, string /*title*/)
 
 ArdourWindow::~ArdourWindow ()
 {
+       WM::Manager::instance().remove (proxy);
 }
 
 bool
@@ -83,7 +85,6 @@ ArdourWindow::on_unmap ()
 bool
 ArdourWindow::on_delete_event (GdkEventAny*)
 {
-       hide ();
        return false;
 }
 
@@ -102,21 +103,21 @@ ArdourWindow::init ()
                vice versa.
         */
 
-       if (ARDOUR_UI::instance()->config()->all_floating_windows_are_dialogs.get()) {
-               cerr << "AW " << get_title() <<  " => dialog\n";
+       if (ARDOUR_UI::instance()->config()->get_all_floating_windows_are_dialogs()) {
                set_type_hint (Gdk::WINDOW_TYPE_HINT_DIALOG);
        } else {
-               cerr << "AW " << get_title() << " => utility\n";
                set_type_hint (Gdk::WINDOW_TYPE_HINT_UTILITY);
        }
 
-       Gtk::Window* parent = WindowManager::instance().transient_parent();
+       Gtk::Window* parent = WM::Manager::instance().transient_parent();
 
        if (parent) {
-               cerr << "\tmarked as transient for " << parent->get_title() << endl;
                set_transient_for (*parent);
        }
        
        ARDOUR_UI::CloseAllDialogs.connect (sigc::mem_fun (*this, &ArdourWindow::hide));
+
+       proxy = new WM::ProxyTemporary (get_title(), this);
+       WM::Manager::instance().register_window (proxy);
 }