more window management rationalization

gtk2_ardour/ardour_dialog.cc

@@ -94,6 +94,13 @@ ArdourDialog::on_show ()
 	}
 }
 
+bool
+ArdourDialog::on_delete_event (GdkEventAny*)
+{
+	hide ();
+	return false;
+}
+
 void
 ArdourDialog::init ()
 {

gtk2_ardour/ardour_dialog.h

@@ -40,6 +40,7 @@ class ArdourDialog : public Gtk::Dialog, public ARDOUR::SessionHandlePtr
 
 	bool on_enter_notify_event (GdkEventCrossing*);
 	bool on_leave_notify_event (GdkEventCrossing*);
+        bool on_delete_event (GdkEventAny *);
 	void on_unmap ();
 	void on_show ();
 

gtk2_ardour/ardour_ui.h

@@ -348,8 +348,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 	void         start_clocking ();
 	void         stop_clocking ();
 
-	void manage_window (Gtk::Window&);
-
 	bool main_window_state_event_handler (GdkEventWindowState*, bool window_was_editor);
 
 	void update_transport_clocks (framepos_t pos);

gtk2_ardour/ardour_ui2.cc

@@ -428,14 +428,6 @@ ARDOUR_UI::setup_transport ()
 	}
 }
 
-void
-ARDOUR_UI::manage_window (Window& win)
-{
-	win.signal_delete_event().connect (sigc::bind (sigc::ptr_fun (just_hide_it), &win));
-	win.signal_enter_notify_event().connect (sigc::bind (sigc::mem_fun (Keyboard::the_keyboard(), &Keyboard::enter_window), &win));
-	win.signal_leave_notify_event().connect (sigc::bind (sigc::mem_fun (Keyboard::the_keyboard(), &Keyboard::leave_window), &win));
-}
-
 void
 ARDOUR_UI::detach_tearoff (Box* b, Widget* w)
 {

gtk2_ardour/ardour_ui_dialogs.cc

@@ -380,7 +380,6 @@ ARDOUR_UI::new_midi_tracer_window ()
 	if (i == _midi_tracer_windows.end()) {
 		/* all our MIDITracer windows are visible; make a new one */
 		MidiTracer* t = new MidiTracer ();
-		manage_window (*t);
 		t->show_all ();
 		_midi_tracer_windows.push_back (t);
 	} else {

gtk2_ardour/ardour_window.cc

@@ -74,6 +74,13 @@ ArdourWindow::on_unmap ()
 	Window::on_unmap ();
 }
 
+bool
+ArdourWindow::on_delete_event (GdkEventAny*)
+{
+	hide ();
+	return false;
+}
+
 void
 ArdourWindow::init ()
 {
@@ -91,8 +98,6 @@ ArdourWindow::init ()
 
         set_type_hint (Gdk::WINDOW_TYPE_HINT_UTILITY);
 
-	signal_delete_event().connect (sigc::bind (sigc::ptr_fun (just_hide_it), this));
-
 	ARDOUR_UI::CloseAllDialogs.connect (sigc::mem_fun (*this, &ArdourWindow::hide));
 }
 

gtk2_ardour/ardour_window.h

@@ -42,6 +42,7 @@ class ArdourWindow : public Gtk::Window, public ARDOUR::SessionHandlePtr, public
 
 	bool on_enter_notify_event (GdkEventCrossing*);
 	bool on_leave_notify_event (GdkEventCrossing*);
+        bool on_delete_event (GdkEventAny *);
 	void on_unmap ();
 
   private: