Only use ArdourDialog (and thus Gtk::Dialog) for actual dialogs.

Fixes #4364.

I havn't fully tested every single dialog and window (heck, I don't even know
how to get at half of them), and there may be some packing niggles, but this is
the bulk of the work.  The Gnome 3 kiddies can close their dialogs now, anyway
:)


git-svn-id: svn://localhost/ardour2/branches/3.0@10699 d708f5d6-7413-0410-9779-e7cbd77b26cf

36 files changed, 120 insertions, 104 deletions

diff --git a/gtk2_ardour/bundle_manager.cc b/gtk2_ardour/bundle_manager.cc
index 6367eb6560..3d0a0e3a37 100644
--- a/gtk2_ardour/bundle_manager.cc
+++ b/gtk2_ardour/bundle_manager.cc
@@ -310,6 +310,9 @@ BundleManager::BundleManager (Session* session)
 		sigc::mem_fun (*this, &BundleManager::row_activated)
 		);
 
+	Gtk::Button* close_but = add_button (Gtk::Stock::CLOSE, Gtk::RESPONSE_ACCEPT);
+	close_but->signal_clicked ().connect (sigc::mem_fun (*this, &Gtk::Window::hide));
+
 	set_button_sensitivity ();
 
 	show_all ();
diff --git a/gtk2_ardour/configinfo.cc b/gtk2_ardour/configinfo.cc
index 636b11accf..29c7e8fe63 100644
--- a/gtk2_ardour/configinfo.cc
+++ b/gtk2_ardour/configinfo.cc
@@ -17,6 +17,8 @@
 
 */
 
+#include <gtkmm.h>
+
 #include "ardour/ardour.h"
 
 #include "configinfo.h"
@@ -32,4 +34,6 @@ ConfigInfoDialog::ConfigInfoDialog ()
 	text.set_size_request (300, 800);
 
 	get_vbox()->pack_start (text, true, true);
+
+	add_button (Gtk::Stock::CLOSE, Gtk::RESPONSE_ACCEPT);
 }
diff --git a/gtk2_ardour/global_port_matrix.cc b/gtk2_ardour/global_port_matrix.cc
index 5e5218bda8..f4803f156b 100644
--- a/gtk2_ardour/global_port_matrix.cc
+++ b/gtk2_ardour/global_port_matrix.cc
@@ -148,8 +148,8 @@ GlobalPortMatrix::get_state (BundleChannel c[2]) const
 }
 
 GlobalPortMatrixWindow::GlobalPortMatrixWindow (Session* s, DataType t)
-	: ArdourDialog (X_("reset me soon"))
-        , _port_matrix (this, s, t)
+	: ArdourWindow (X_("reset me soon"))
+	, _port_matrix (this, s, t)
 {
 	switch (t) {
 	case DataType::AUDIO:
@@ -160,7 +160,7 @@ GlobalPortMatrixWindow::GlobalPortMatrixWindow (Session* s, DataType t)
 		break;
 	}
 
-	get_vbox()->pack_start (_port_matrix, true, true);
+	add (_port_matrix);
 	_port_matrix.show ();
 }
 
diff --git a/gtk2_ardour/global_port_matrix.h b/gtk2_ardour/global_port_matrix.h
index 2ecf26c33d..1dabcbd379 100644
--- a/gtk2_ardour/global_port_matrix.h
+++ b/gtk2_ardour/global_port_matrix.h
@@ -23,7 +23,7 @@
 #include <gtkmm/button.h>
 #include "port_matrix.h"
 #include "port_group.h"
-#include "ardour_dialog.h"
+#include "ardour_window.h"
 
 class GlobalPortMatrix : public PortMatrix
 {
@@ -50,7 +50,7 @@ private:
 	};
 };
 
-class GlobalPortMatrixWindow : public ArdourDialog
+class GlobalPortMatrixWindow : public ArdourWindow
 {
 public:
 	GlobalPortMatrixWindow (ARDOUR::Session *, ARDOUR::DataType);
diff --git a/gtk2_ardour/keyeditor.cc b/gtk2_ardour/keyeditor.cc
index 88c4682c55..5ebc4178c8 100644
--- a/gtk2_ardour/keyeditor.cc
+++ b/gtk2_ardour/keyeditor.cc
@@ -53,7 +53,7 @@ using namespace PBD;
 using Gtkmm2ext::Keyboard;
 
 KeyEditor::KeyEditor ()
-	: ArdourDialog (_("Key Bindings"), false)
+	: ArdourWindow (_("Key Bindings"))
 	, unbind_button (_("Remove shortcut"))
 	, unbind_box (BUTTONBOX_END)
 
@@ -79,9 +79,7 @@ KeyEditor::KeyEditor ()
 	scroller.add (view);
 	scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
 
-
-	get_vbox()->set_spacing (6);
-	get_vbox()->pack_start (scroller);
+	add (scroller);
 
 	if (!ARDOUR::Profile->get_sae()) {
 
@@ -92,14 +90,12 @@ KeyEditor::KeyEditor ()
 		unbind_box.pack_start (unbind_button, false, false);
 		unbind_button.signal_clicked().connect (sigc::mem_fun (*this, &KeyEditor::unbind));
 
-		get_vbox()->pack_start (unbind_box, false, false);
+		add (unbind_box);
 		unbind_box.show ();
 		unbind_button.show ();
 
 	}
 
-	get_vbox()->set_border_width (12);
-
 	view.show ();
 	scroller.show ();
 
@@ -137,13 +133,13 @@ KeyEditor::on_show ()
 {
 	populate ();
 	view.get_selection()->unselect_all ();
-	ArdourDialog::on_show ();
+	ArdourWindow::on_show ();
 }
 
 void
 KeyEditor::on_unmap ()
 {
-	ArdourDialog::on_unmap ();
+	ArdourWindow::on_unmap ();
 }
 
 void
diff --git a/gtk2_ardour/keyeditor.h b/gtk2_ardour/keyeditor.h
index 1fa807ac5b..1fc3c44155 100644
--- a/gtk2_ardour/keyeditor.h
+++ b/gtk2_ardour/keyeditor.h
@@ -8,9 +8,9 @@
 #include <gtkmm/treestore.h>
 #include <gtkmm/scrolledwindow.h>
 
-#include "ardour_dialog.h"
+#include "ardour_window.h"
 
-class KeyEditor : public ArdourDialog
+class KeyEditor : public ArdourWindow
 {
   public:
 	KeyEditor ();
diff --git a/gtk2_ardour/location_ui.cc b/gtk2_ardour/location_ui.cc
index 020638d600..5797cd66ee 100644
--- a/gtk2_ardour/location_ui.cc
+++ b/gtk2_ardour/location_ui.cc
@@ -1110,12 +1110,12 @@ LocationUI::session_going_away()
 /*------------------------*/
 
 LocationUIWindow::LocationUIWindow ()
-	: ArdourDialog (_("Locations"))
+	: ArdourWindow (_("Locations"))
 {
 	set_wmclass(X_("ardour_locations"), PROGRAM_NAME);
 	set_name ("LocationWindow");
 
-	get_vbox()->pack_start (_ui);
+	add (_ui);
 }
 
 LocationUIWindow::~LocationUIWindow()
@@ -1125,7 +1125,7 @@ LocationUIWindow::~LocationUIWindow()
 void
 LocationUIWindow::on_map ()
 {
-	ArdourDialog::on_map ();
+	ArdourWindow::on_map ();
 	_ui.refresh_location_list();
 }
 
@@ -1139,13 +1139,13 @@ LocationUIWindow::on_delete_event (GdkEventAny*)
 void
 LocationUIWindow::set_session (Session *s)
 {
-	ArdourDialog::set_session (s);
+	ArdourWindow::set_session (s);
 	_ui.set_session (s);
 }
 
 void
 LocationUIWindow::session_going_away ()
 {
-	ArdourDialog::session_going_away ();
+	ArdourWindow::session_going_away ();
 	hide_all();
 }
diff --git a/gtk2_ardour/location_ui.h b/gtk2_ardour/location_ui.h
index eef33b161f..485a24499c 100644
--- a/gtk2_ardour/location_ui.h
+++ b/gtk2_ardour/location_ui.h
@@ -34,7 +34,7 @@
 #include "ardour/location.h"
 #include "ardour/session_handle.h"
 
-#include "ardour_dialog.h"
+#include "ardour_window.h"
 #include "audio_clock.h"
 
 namespace ARDOUR {
@@ -199,7 +199,7 @@ class LocationUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
         ClockGroup* _clock_group;
 };
 
-class LocationUIWindow : public ArdourDialog
+class LocationUIWindow : public ArdourWindow
 {
   public:
 	LocationUIWindow ();
diff --git a/gtk2_ardour/midi_list_editor.cc b/gtk2_ardour/midi_list_editor.cc
index c6dfc6c713..879b1a9f2f 100644
--- a/gtk2_ardour/midi_list_editor.cc
+++ b/gtk2_ardour/midi_list_editor.cc
@@ -38,7 +38,7 @@ using namespace Glib;
 using namespace ARDOUR;
 
 MidiListEditor::MidiListEditor (Session* s, boost::shared_ptr<MidiRegion> r)
-	: ArdourDialog (r->name(), false, false)
+	: ArdourWindow (r->name())
 	, region (r)
 {
 	/* We do not handle nested sources/regions. Caller should have tackled this */
@@ -83,7 +83,7 @@ MidiListEditor::MidiListEditor (Session* s, boost::shared_ptr<MidiRegion> r)
 	view.show ();
 	scroller.show ();
 
-	get_vbox()->pack_start (scroller);
+	add (scroller);
 	set_size_request (400, 400);
 }
 
diff --git a/gtk2_ardour/midi_list_editor.h b/gtk2_ardour/midi_list_editor.h
index 1d982fd56d..c85eeafc51 100644
--- a/gtk2_ardour/midi_list_editor.h
+++ b/gtk2_ardour/midi_list_editor.h
@@ -27,7 +27,7 @@
 
 #include "ardour/session_handle.h"
 
-#include "ardour_dialog.h"
+#include "ardour_window.h"
 
 namespace Evoral {
 	template<typename Time> class Note;
@@ -39,7 +39,7 @@ namespace ARDOUR {
 	class Session;
 };
 
-class MidiListEditor : public ArdourDialog
+class MidiListEditor : public ArdourWindow
 {
   public:
 	typedef Evoral::Note<Evoral::MusicalTime> NoteType;
diff --git a/gtk2_ardour/midi_tracer.cc b/gtk2_ardour/midi_tracer.cc
index 357772c91c..6da5244600 100644
--- a/gtk2_ardour/midi_tracer.cc
+++ b/gtk2_ardour/midi_tracer.cc
@@ -36,7 +36,7 @@ using namespace MIDI;
 using namespace Glib;
 
 MidiTracer::MidiTracer ()
-	: ArdourDialog (_("MIDI Tracer"))
+	: ArdourWindow (_("MIDI Tracer"))
 	, parser (0)
 	, line_count_adjustment (200, 1, 2000, 1, 10)
 	, line_count_spinner (line_count_adjustment)
@@ -51,10 +51,11 @@ MidiTracer::MidiTracer ()
 	, base_button (_("Decimal"))
 	, collect_button (_("Enabled"))
 {
-	get_vbox()->set_spacing (4);
-
 	Manager::instance()->PortsChanged.connect (_manager_connection, invalidator (*this), boost::bind (&MidiTracer::ports_changed, this), gui_context());
 
+	VBox* vbox = manage (new VBox);
+	vbox->set_spacing (4);
+
 	HBox* pbox = manage (new HBox);
 	pbox->set_spacing (6);
 	pbox->pack_start (*manage (new Label (_("Port:"))), false, false);
@@ -62,11 +63,11 @@ MidiTracer::MidiTracer ()
 	_port_combo.signal_changed().connect (sigc::mem_fun (*this, &MidiTracer::port_changed));
 	pbox->pack_start (_port_combo);
 	pbox->show_all ();
-	get_vbox()->pack_start (*pbox, false, false);
+	vbox->pack_start (*pbox, false, false);
 
 	scroller.add (text);
-	get_vbox()->set_border_width (12);
-	get_vbox()->pack_start (scroller, true, true);
+	vbox->set_border_width (12);
+	vbox->pack_start (scroller, true, true);
 
 	text.show ();
 	text.set_name ("MidiTracerTextView");
@@ -85,15 +86,16 @@ MidiTracer::MidiTracer ()
 	line_count_label.show ();
 	line_count_box.show ();
 
-	get_action_area()->add (line_count_box);
-
 	HBox* bbox = manage (new HBox);
+	bbox->add (line_count_box);
 	bbox->add (base_button);
 	bbox->add (collect_button);
 	bbox->add (autoscroll_button);
 	bbox->show ();
 
-	get_action_area()->add (*bbox);
+	vbox->pack_start (*bbox, false, false);
+
+	add (*vbox);
 
 	base_button.signal_toggled().connect (sigc::mem_fun (*this, &MidiTracer::base_toggle));
 	collect_button.signal_toggled().connect (sigc::mem_fun (*this, &MidiTracer::collect_toggle));
diff --git a/gtk2_ardour/midi_tracer.h b/gtk2_ardour/midi_tracer.h
index 8383b616a0..0b195bf31e 100644
--- a/gtk2_ardour/midi_tracer.h
+++ b/gtk2_ardour/midi_tracer.h
@@ -8,18 +8,19 @@
 #include <gtkmm/spinbutton.h>
 #include <gtkmm/label.h>
 #include <gtkmm/comboboxtext.h>
+#include <gtkmm/box.h>
 
 #include "pbd/signals.h"
 #include "pbd/ringbuffer.h"
 #include "pbd/pool.h"
 #include "midi++/types.h"
-#include "ardour_dialog.h"
+#include "ardour_window.h"
 
 namespace MIDI {
 	class Parser;
 }
 
-class MidiTracer : public ArdourDialog
+class MidiTracer : public ArdourWindow
 {
   public:
 	MidiTracer ();
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 18f65d7880..4442fddb51 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -54,7 +54,7 @@
 #include "ardour/port.h"
 
 #include "ardour_ui.h"
-#include "ardour_dialog.h"
+#include "ardour_window.h"
 #include "mixer_strip.h"
 #include "mixer_ui.h"
 #include "keyboard.h"
@@ -1351,7 +1351,7 @@ MixerStrip::open_comment_editor ()
 void
 MixerStrip::setup_comment_editor ()
 {
-	comment_window = new ArdourDialog ("", false); // title will be reset to show route
+	comment_window = new ArdourWindow (""); // title will be reset to show route
 	comment_window->set_position (Gtk::WIN_POS_MOUSE);
 	comment_window->set_skip_taskbar_hint (true);
 	comment_window->signal_hide().connect (sigc::mem_fun(*this, &MixerStrip::comment_editor_done_editing));
@@ -1364,8 +1364,7 @@ MixerStrip::setup_comment_editor ()
 	comment_area->get_buffer()->set_text (_route->comment());
 	comment_area->show ();
 
-	comment_window->get_vbox()->pack_start (*comment_area);
-	comment_window->get_action_area()->hide();
+	comment_window->add (*comment_area);
 }
 
 void
diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h
index 82ab35f332..8e0100ed75 100644
--- a/gtk2_ardour/mixer_strip.h
+++ b/gtk2_ardour/mixer_strip.h
@@ -52,7 +52,6 @@
 #include "panner_ui.h"
 #include "enums.h"
 #include "processor_box.h"
-#include "ardour_dialog.h"
 #include "visibility_group.h"
 
 namespace ARDOUR {
@@ -73,6 +72,7 @@ class Mixer_UI;
 class IOSelectorWindow;
 class MotionController;
 class RouteGroupMenu;
+class ArdourWindow;
 
 class MixerStrip : public RouteUI, public Gtk::EventBox
 {
@@ -202,7 +202,7 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
 
 	Gtk::Button   name_button;
 
-	ArdourDialog*  comment_window;
+	ArdourWindow*  comment_window;
 	Gtk::TextView* comment_area;
 	Gtk::Button   _comment_button;
 
diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc
index 040adc2db9..acb8551960 100644
--- a/gtk2_ardour/option_editor.cc
+++ b/gtk2_ardour/option_editor.cc
@@ -237,7 +237,7 @@ OptionEditorPage::OptionEditorPage (Gtk::Notebook& n, std::string const & t)
  *  @param t Title for the dialog.
  */
 OptionEditor::OptionEditor (Configuration* c, std::string const & t)
-	: ArdourDialog (t, false), _config (c)
+	: ArdourWindow (t), _config (c)
 {
 	using namespace Notebook_Helpers;
 
@@ -249,8 +249,7 @@ OptionEditor::OptionEditor (Configuration* c, std::string const & t)
 
 	set_border_width (4);
 
-	get_vbox()->set_spacing (4);
-	get_vbox()->pack_start (_notebook);
+	add (_notebook);
 
 	_notebook.set_show_tabs (true);
 	_notebook.set_show_border (true);
diff --git a/gtk2_ardour/option_editor.h b/gtk2_ardour/option_editor.h
index f3f2164c77..6cacb3c5aa 100644
--- a/gtk2_ardour/option_editor.h
+++ b/gtk2_ardour/option_editor.h
@@ -26,7 +26,7 @@
 #include <gtkmm/spinbutton.h>
 #include <gtkmm/table.h>
 #include "gtkmm2ext/slider_controller.h"
-#include "ardour_dialog.h"
+#include "ardour_window.h"
 #include "audio_clock.h"
 #include "ardour/types.h"
 
@@ -408,7 +408,7 @@ public:
 };
 
 /** The OptionEditor dialog base class */
-class OptionEditor : public ArdourDialog
+class OptionEditor : public ArdourWindow
 {
 public:
 	OptionEditor (ARDOUR::Configuration *, std::string const &);
diff --git a/gtk2_ardour/panner2d.cc b/gtk2_ardour/panner2d.cc
index ffe9a15954..64d83ab162 100644
--- a/gtk2_ardour/panner2d.cc
+++ b/gtk2_ardour/panner2d.cc
@@ -778,7 +778,7 @@ Panner2d::toggle_bypass ()
 }
 
 Panner2dWindow::Panner2dWindow (boost::shared_ptr<PannerShell> p, int32_t h, uint32_t inputs)
-	: ArdourDialog (_("Panner (2D)"))
+	: ArdourWindow (_("Panner (2D)"))
         , widget (p, h)
 	, bypass_button (_("Bypass"))
 {
@@ -809,7 +809,7 @@ Panner2dWindow::Panner2dWindow (boost::shared_ptr<PannerShell> p, int32_t h, uin
 	hpacker.pack_start (left_side, false, false);
 	hpacker.show ();
 
-	get_vbox()->pack_start (hpacker);
+	add (hpacker);
 	reset (inputs);
 	widget.show ();
 }
diff --git a/gtk2_ardour/panner2d.h b/gtk2_ardour/panner2d.h
index eb938be8f0..881638856f 100644
--- a/gtk2_ardour/panner2d.h
+++ b/gtk2_ardour/panner2d.h
@@ -34,7 +34,7 @@
 
 #include "pbd/cartesian.h"
 
-#include "ardour_dialog.h"
+#include "ardour_window.h"
 
 namespace ARDOUR {
 	class PannerShell;
@@ -143,7 +143,7 @@ class Panner2d : public Gtk::DrawingArea
 	void clamp_to_circle (double& x, double& y);
 };
 
-class Panner2dWindow : public ArdourDialog
+class Panner2dWindow : public ArdourWindow
 {
   public:
 	Panner2dWindow (boost::shared_ptr<ARDOUR::PannerShell>, int32_t height, uint32_t inputs);
diff --git a/gtk2_ardour/plugin_ui.cc b/gtk2_ardour/plugin_ui.cc
index 741fcbe631..f7410bba3c 100644
--- a/gtk2_ardour/plugin_ui.cc
+++ b/gtk2_ardour/plugin_ui.cc
@@ -61,7 +61,7 @@
 
 #include <lrdf.h>
 
-#include "ardour_dialog.h"
+#include "ardour_window.h"
 #include "ardour_ui.h"
 #include "prompter.h"
 #include "plugin_ui.h"
@@ -561,8 +561,8 @@ PlugUIBase::latency_button_clicked ()
 {
 	if (!latency_gui) {
 		latency_gui = new LatencyGUI (*(insert.get()), insert->session().frame_rate(), insert->session().get_block_size());
-		latency_dialog = new ArdourDialog (_("Edit Latency"), false, false);
-		latency_dialog->get_vbox()->pack_start (*latency_gui);
+		latency_dialog = new ArdourWindow (_("Edit Latency"));
+		latency_dialog->add (*latency_gui);
 		latency_dialog->signal_hide().connect (sigc::mem_fun (*this, &PlugUIBase::set_latency_label));
 	}
 
diff --git a/gtk2_ardour/plugin_ui.h b/gtk2_ardour/plugin_ui.h
index 5ee275c240..66b025527a 100644
--- a/gtk2_ardour/plugin_ui.h
+++ b/gtk2_ardour/plugin_ui.h
@@ -72,7 +72,7 @@ namespace Gtkmm2ext {
 }
 
 class LatencyGUI;
-class ArdourDialog;
+class ArdourWindow;
 class PluginEqGui;
 
 class PlugUIBase : public virtual sigc::trackable, public PBD::ScopedConnectionList
@@ -119,7 +119,7 @@ class PlugUIBase : public virtual sigc::trackable, public PBD::ScopedConnectionL
 	void set_latency_label ();
 
 	LatencyGUI* latency_gui;
-	ArdourDialog* latency_dialog;
+	ArdourWindow* latency_dialog;
 
 	Gtk::Expander plugin_analysis_expander;
 	PluginEqGui* eqgui;
diff --git a/gtk2_ardour/port_insert_ui.cc b/gtk2_ardour/port_insert_ui.cc
index 8379d1a4ed..4e9a3b1c1e 100644
--- a/gtk2_ardour/port_insert_ui.cc
+++ b/gtk2_ardour/port_insert_ui.cc
@@ -176,6 +176,12 @@ PortInsertWindow::PortInsertWindow (ARDOUR::Session* sess, boost::shared_ptr<ARD
 
 	get_vbox()->pack_start (_portinsertui);
 
+	Gtk::Button* cancel_but = add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
+	Gtk::Button* ok_but = add_button (Gtk::Stock::OK, Gtk::RESPONSE_OK);
+
+	cancel_but->signal_clicked().connect (sigc::mem_fun (*this, &PortInsertWindow::cancel));
+	ok_but->signal_clicked().connect (sigc::mem_fun (*this, &PortInsertWindow::accept));
+
 	signal_delete_event().connect (sigc::mem_fun (*this, &PortInsertWindow::wm_delete), false);
 
 	pi->DropReferences.connect (going_away_connection, invalidator (*this), boost::bind (&PortInsertWindow::plugin_going_away, this), gui_context());
diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc
index 249846a296..a82bce636e 100644
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -38,6 +38,8 @@
 #include "ardour/control_protocol_manager.h"
 #include "control_protocol/control_protocol.h"
 
+#include "ardour_window.h"
+#include "ardour_dialog.h"
 #include "gui_thread.h"
 #include "midi_tracer.h"
 #include "rc_option_editor.h"
@@ -56,7 +58,7 @@ using namespace ARDOUR;
 class ClickOptions : public OptionEditorBox
 {
 public:
-	ClickOptions (RCConfiguration* c, ArdourDialog* p)
+	ClickOptions (RCConfiguration* c, Gtk::Window* p)
 		: _rc_config (c),
 		  _parent (p)
 	{
@@ -149,7 +151,7 @@ private:
 	}
 
 	RCConfiguration* _rc_config;
-	ArdourDialog* _parent;
+	Gtk::Window* _parent;
 	Entry _click_path_entry;
 	Entry _click_emphasis_path_entry;
 };
@@ -657,7 +659,7 @@ private:
 class ControlSurfacesOptions : public OptionEditorBox
 {
 public:
-	ControlSurfacesOptions (ArdourDialog& parent)
+	ControlSurfacesOptions (Gtk::Window& parent)
 		: _parent (parent)
 	{
 		_store = ListStore::create (_model);
@@ -754,8 +756,8 @@ private:
 				Box* box = (Box*) cpi->protocol->get_gui ();
 				if (box) {
 					string title = row[_model.name];
-					ArdourDialog* win = new ArdourDialog (_parent, title);
-					win->get_vbox()->pack_start (*box, false, false);
+					ArdourWindow* win = new ArdourWindow (_parent, title);
+					win->add (*box);
 					box->show ();
 					win->present ();
 					row[_model.editor] = win;
diff --git a/gtk2_ardour/region_layering_order_editor.cc b/gtk2_ardour/region_layering_order_editor.cc
index d2e0db5e11..c8690a5351 100644
--- a/gtk2_ardour/region_layering_order_editor.cc
+++ b/gtk2_ardour/region_layering_order_editor.cc
@@ -15,7 +15,7 @@ using namespace Gtk;
 using namespace ARDOUR;
 
 RegionLayeringOrderEditor::RegionLayeringOrderEditor (PublicEditor& pe)
-	: ArdourDialog (pe, _("RegionLayeringOrderEditor"), false, false)
+	: ArdourWindow (pe, _("RegionLayeringOrderEditor"))
 	, playlist ()
 	, position ()
 	, in_row_change (false)
@@ -65,9 +65,11 @@ RegionLayeringOrderEditor::RegionLayeringOrderEditor (PublicEditor& pe)
         info_table->attach (clock_label, 0, 1, 1, 2, FILL, FILL);
         info_table->attach (clock, 1, 2, 1, 2, FILL, FILL);
 
-        get_vbox()->set_spacing (12);
-        get_vbox()->pack_start (*info_table, false, false);
-        get_vbox()->pack_start (*scroller_table, true, true);
+	Gtk::VBox* vbox = Gtk::manage (new Gtk::VBox ());
+	vbox->set_spacing (12);
+	vbox->pack_start (*info_table, false, false);
+	vbox->pack_start (*scroller_table, true, true);
+	add (*vbox);
 
         info_table->set_name ("RegionLayeringOrderTable");
         scroller_table->set_name ("RegionLayeringOrderTable");
@@ -185,7 +187,7 @@ RegionLayeringOrderEditor::on_key_press_event (GdkEventKey* ev)
 	*/
 
 	if (ev->keyval == GDK_Return) {
-		handled = ArdourDialog::on_key_press_event (ev);
+		handled = ArdourWindow::on_key_press_event (ev);
 	}
 
 	if (!handled) {
@@ -193,7 +195,7 @@ RegionLayeringOrderEditor::on_key_press_event (GdkEventKey* ev)
 	}
 
 	if (!handled) {
-		handled = ArdourDialog::on_key_press_event (ev);
+		handled = ArdourWindow::on_key_press_event (ev);
 	}
 
 	return handled;
diff --git a/gtk2_ardour/region_layering_order_editor.h b/gtk2_ardour/region_layering_order_editor.h
index 783d05804c..aad8729759 100644
--- a/gtk2_ardour/region_layering_order_editor.h
+++ b/gtk2_ardour/region_layering_order_editor.h
@@ -9,7 +9,7 @@
 #include "ardour/region.h"
 #include "ardour/playlist.h"
 
-#include "ardour_dialog.h"
+#include "ardour_window.h"
 #include "audio_clock.h"
 
 class PublicEditor;
@@ -18,7 +18,7 @@ namespace ARDOUR {
 	class Session;
 }
 
-class RegionLayeringOrderEditor : public ArdourDialog
+class RegionLayeringOrderEditor : public ArdourWindow
 {
   public:
 	RegionLayeringOrderEditor (PublicEditor&);
diff --git a/gtk2_ardour/return_ui.cc b/gtk2_ardour/return_ui.cc
index 4ac3ab8ad1..6edd57a286 100644
--- a/gtk2_ardour/return_ui.cc
+++ b/gtk2_ardour/return_ui.cc
@@ -101,14 +101,13 @@ ReturnUI::fast_update ()
 }
 
 ReturnUIWindow::ReturnUIWindow (boost::shared_ptr<Return> r, ARDOUR::Session* s)
-	: ArdourDialog (string(_("Return ")) + r->name())
+	: ArdourWindow (string(_("Return ")) + r->name())
 {
 	ui = new ReturnUI (this, r, s);
 
 	hpacker.pack_start (*ui, true, true);
 
-	get_vbox()->set_border_width (5);
-	get_vbox()->pack_start (hpacker);
+	add (hpacker);
 
 	set_name ("ReturnUIWindow");
 
diff --git a/gtk2_ardour/return_ui.h b/gtk2_ardour/return_ui.h
index be7cb28056..ab10e1f566 100644
--- a/gtk2_ardour/return_ui.h
+++ b/gtk2_ardour/return_ui.h
@@ -22,7 +22,7 @@
 
 #include "gain_meter.h"
 #include "panner_ui.h"
-#include "ardour_dialog.h"
+#include "ardour_window.h"
 
 namespace ARDOUR {
 	class Return;
@@ -57,7 +57,7 @@ class ReturnUI : public Gtk::HBox
 	void ins_changed (ARDOUR::IOChange, void*);
 };
 
-class ReturnUIWindow : public ArdourDialog
+class ReturnUIWindow : public ArdourWindow
 {
   public:
 	ReturnUIWindow(boost::shared_ptr<ARDOUR::Return>, ARDOUR::Session*);
diff --git a/gtk2_ardour/route_params_ui.cc b/gtk2_ardour/route_params_ui.cc
index cafda5ab9b..8f31e7e95e 100644
--- a/gtk2_ardour/route_params_ui.cc
+++ b/gtk2_ardour/route_params_ui.cc
@@ -59,7 +59,7 @@ using namespace Gtk;
 using namespace Gtkmm2ext;
 
 RouteParams_UI::RouteParams_UI ()
-	: ArdourDialog (_("Tracks and Busses")),
+	: ArdourWindow (_("Tracks and Busses")),
 	  latency_apply_button (Stock::APPLY),
 	  track_menu(0)
 {
@@ -137,7 +137,7 @@ RouteParams_UI::RouteParams_UI ()
 
 	//global_vpacker.pack_start (list_hpane, true, true);
 	//get_vbox()->pack_start (global_vpacker);
-	get_vbox()->pack_start (list_hpane);
+	add (list_hpane);
 
 
 	set_name ("RouteParamsWindow");
@@ -394,7 +394,7 @@ RouteParams_UI::route_removed (boost::weak_ptr<Route> wr)
 void
 RouteParams_UI::set_session (Session *sess)
 {
-	ArdourDialog::set_session (sess);
+	ArdourWindow::set_session (sess);
 
 	route_display_model->clear();
 	_plugin_selector->set_session (_session);
diff --git a/gtk2_ardour/route_params_ui.h b/gtk2_ardour/route_params_ui.h
index 96cc6f0595..085949539b 100644
--- a/gtk2_ardour/route_params_ui.h
+++ b/gtk2_ardour/route_params_ui.h
@@ -37,7 +37,7 @@
 
 #include "ardour/ardour.h"
 
-#include "ardour_dialog.h"
+#include "ardour_window.h"
 #include "processor_box.h"
 #include "route_processor_selection.h"
 #include "latency_gui.h"
@@ -55,7 +55,7 @@ namespace ARDOUR {
 class PluginSelector;
 class IOSelector;
 
-class RouteParams_UI : public ArdourDialog, public PBD::ScopedConnectionList
+class RouteParams_UI : public ArdourWindow, public PBD::ScopedConnectionList
 {
   public:
 	RouteParams_UI ();
diff --git a/gtk2_ardour/send_ui.cc b/gtk2_ardour/send_ui.cc
index 7cf8228ffe..a000bfcaa9 100644
--- a/gtk2_ardour/send_ui.cc
+++ b/gtk2_ardour/send_ui.cc
@@ -117,14 +117,13 @@ SendUI::fast_update ()
 }
 
 SendUIWindow::SendUIWindow (boost::shared_ptr<Send> s, Session* session)
-	: ArdourDialog (string (_("Send ")) + s->name())
+	: ArdourWindow (string (_("Send ")) + s->name())
 {
 	ui = new SendUI (this, s, session);
 
 	hpacker.pack_start (*ui, true, true);
 
-	get_vbox()->set_border_width (5);
-	get_vbox()->pack_start (hpacker);
+	add (hpacker);
 
 	set_name ("SendUIWindow");
 
diff --git a/gtk2_ardour/send_ui.h b/gtk2_ardour/send_ui.h
index c32068ee47..9f423bd6fe 100644
--- a/gtk2_ardour/send_ui.h
+++ b/gtk2_ardour/send_ui.h
@@ -22,7 +22,7 @@
 
 #include "gain_meter.h"
 #include "panner_ui.h"
-#include "ardour_dialog.h"
+#include "ardour_window.h"
 
 namespace ARDOUR {
 	class Send;
@@ -58,7 +58,7 @@ class SendUI : public Gtk::HBox
 	PBD::ScopedConnectionList connections;
 };
 
-class SendUIWindow : public ArdourDialog
+class SendUIWindow : public ArdourWindow
 {
   public:
 	SendUIWindow(boost::shared_ptr<ARDOUR::Send>, ARDOUR::Session*);
diff --git a/gtk2_ardour/speaker_dialog.cc b/gtk2_ardour/speaker_dialog.cc
index 3d0c348df4..5fcb2b23a5 100644
--- a/gtk2_ardour/speaker_dialog.cc
+++ b/gtk2_ardour/speaker_dialog.cc
@@ -33,7 +33,7 @@ using namespace Gtk;
 using namespace Gtkmm2ext;
 
 SpeakerDialog::SpeakerDialog ()
-        : ArdourDialog (_("Speaker Configuration"))
+        : ArdourWindow (_("Speaker Configuration"))
         , aspect_frame ("", 0.5, 0.5, 1.0, false)
         , azimuth_adjustment (0, 0.0, 360.0, 10.0, 1.0)
         , azimuth_spinner (azimuth_adjustment)
@@ -64,9 +64,11 @@ SpeakerDialog::SpeakerDialog ()
 	current_speaker_hbox->pack_start (azimuth_spinner, true, true);
 	current_speaker_hbox->pack_start (remove_speaker_button, true, true);
 
-        get_vbox()->pack_start (hbox);
-        get_vbox()->pack_start (*current_speaker_hbox, true, true);
-        get_vbox()->show_all ();
+	VBox* vbox = manage (new VBox);
+	vbox->pack_start (hbox);
+	vbox->pack_start (*current_speaker_hbox, true, true);
+	vbox->show_all ();
+	add (*vbox);
 
         darea.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::POINTER_MOTION_MASK);
 
diff --git a/gtk2_ardour/speaker_dialog.h b/gtk2_ardour/speaker_dialog.h
index eefdd11afa..2fce9e55c3 100644
--- a/gtk2_ardour/speaker_dialog.h
+++ b/gtk2_ardour/speaker_dialog.h
@@ -28,9 +28,9 @@
 
 #include "ardour/speakers.h"
 
-#include "ardour_dialog.h"
+#include "ardour_window.h"
 
-class SpeakerDialog  : public ArdourDialog
+class SpeakerDialog  : public ArdourWindow
 {
 public:
 	SpeakerDialog ();
diff --git a/gtk2_ardour/step_entry.cc b/gtk2_ardour/step_entry.cc
index 8c26e1d20e..61bdeacae0 100644
--- a/gtk2_ardour/step_entry.cc
+++ b/gtk2_ardour/step_entry.cc
@@ -57,7 +57,7 @@ _rest_event_handler (GtkWidget* /*widget*/, gpointer arg)
 }
 
 StepEntry::StepEntry (StepEditor& seditor)
-	: ArdourDialog (string_compose (_("Step Entry: %1"), seditor.name()))
+	: ArdourWindow (string_compose (_("Step Entry: %1"), seditor.name()))
         , _current_note_length (1.0)
         , _current_note_velocity (64)
 	, triplet_button ("3")
@@ -458,7 +458,7 @@ StepEntry::StepEntry (StepEditor& seditor)
 	packer.pack_start (*piano, false, false);
 	packer.show_all ();
 
-	get_vbox()->add (packer);
+	add (packer);
 
 	/* initial settings: quarter note and mezzo forte */
 
@@ -574,7 +574,7 @@ StepEntry::note_off_event_handler (int note)
 void
 StepEntry::on_show ()
 {
-	ArdourDialog::on_show ();
+	ArdourWindow::on_show ();
 	//piano->grab_focus ();
 }
 
diff --git a/gtk2_ardour/step_entry.h b/gtk2_ardour/step_entry.h
index c916c143bd..364be67114 100644
--- a/gtk2_ardour/step_entry.h
+++ b/gtk2_ardour/step_entry.h
@@ -27,12 +27,12 @@
 #include <gtkmm/adjustment.h>
 #include <gtkmm2ext/bindings.h>
 
-#include "ardour_dialog.h"
+#include "ardour_window.h"
 #include "gtk_pianokeyboard.h"
 
 class StepEditor;
 
-class StepEntry : public ArdourDialog
+class StepEntry : public ArdourWindow
 {
   public:
         StepEntry (StepEditor&);
diff --git a/gtk2_ardour/theme_manager.cc b/gtk2_ardour/theme_manager.cc
index 0d37d50abc..1f172c5515 100644
--- a/gtk2_ardour/theme_manager.cc
+++ b/gtk2_ardour/theme_manager.cc
@@ -49,7 +49,7 @@ sigc::signal<void> ColorsChanged;
 sigc::signal<void,uint32_t> ColorChanged;
 
 ThemeManager::ThemeManager()
-	: ArdourDialog (_("Theme Manager")),
+	: ArdourWindow (_("Theme Manager")),
 	  dark_button (_("Dark Theme")),
 	  light_button (_("Light Theme")),
 	  reset_button (_("Restore Defaults"))
@@ -79,10 +79,12 @@ ThemeManager::ThemeManager()
 	theme_selection_hbox.pack_start (dark_button);
 	theme_selection_hbox.pack_start (light_button);
 
-	get_vbox()->set_homogeneous(false);
-	get_vbox()->pack_start (theme_selection_hbox, PACK_SHRINK);
-	get_vbox()->pack_start (reset_button, PACK_SHRINK);
-	get_vbox()->pack_start (scroller);
+	Gtk::VBox* vbox = Gtk::manage (new Gtk::VBox ());
+	vbox->set_homogeneous (false);
+	vbox->pack_start (theme_selection_hbox, PACK_SHRINK);
+	vbox->pack_start (reset_button, PACK_SHRINK);
+	vbox->pack_start (scroller);
+	add (*vbox);
 
 	color_display.signal_button_press_event().connect (sigc::mem_fun (*this, &ThemeManager::button_press_event), false);
 
diff --git a/gtk2_ardour/theme_manager.h b/gtk2_ardour/theme_manager.h
index 37a451da07..96789f1232 100644
--- a/gtk2_ardour/theme_manager.h
+++ b/gtk2_ardour/theme_manager.h
@@ -27,10 +27,10 @@
 #include <gtkmm/radiobutton.h>
 #include <gtkmm/button.h>
 #include <gtkmm/rc.h>
-#include "ardour_dialog.h"
+#include "ardour_window.h"
 #include "ui_config.h"
 
-class ThemeManager : public ArdourDialog
+class ThemeManager : public ArdourWindow
 {
   public:
 	ThemeManager();