From 7e1b86aceeef477e13b4c35f524034d909acd92c Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 26 Jan 2009 20:41:22 +0000 Subject: [PATCH] Make global port matrix a Gtk::Window rather than an ArdourDialog. git-svn-id: svn://localhost/ardour2/branches/3.0@4445 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/global_port_matrix.cc | 19 +++++++++++++------ gtk2_ardour/global_port_matrix.h | 2 +- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/gtk2_ardour/global_port_matrix.cc b/gtk2_ardour/global_port_matrix.cc index 80ddecc813..02a2862105 100644 --- a/gtk2_ardour/global_port_matrix.cc +++ b/gtk2_ardour/global_port_matrix.cc @@ -124,12 +124,19 @@ GlobalPortMatrix::get_state ( GlobalPortMatrixWindow::GlobalPortMatrixWindow (ARDOUR::Session& s, ARDOUR::DataType t) - : ArdourDialog ( - t == ARDOUR::DataType::AUDIO ? - _("Audio Connections Manager") : - _("MIDI Connections Manager")), - _port_matrix (s, t) + : _port_matrix (s, t) { - get_vbox()->pack_start (_port_matrix); + switch (t) { + case ARDOUR::DataType::AUDIO: + set_title (_("Audio Connections Manager")); + break; + case ARDOUR::DataType::MIDI: + set_title (_("MIDI Connections Manager")); + break; + } + + Gtk::VBox* vbox = Gtk::manage (new Gtk::VBox); + vbox->pack_start (_port_matrix); + add (*vbox); show_all (); } diff --git a/gtk2_ardour/global_port_matrix.h b/gtk2_ardour/global_port_matrix.h index 845a348efd..2eca9dee7f 100644 --- a/gtk2_ardour/global_port_matrix.h +++ b/gtk2_ardour/global_port_matrix.h @@ -62,7 +62,7 @@ private: }; -class GlobalPortMatrixWindow : public ArdourDialog +class GlobalPortMatrixWindow : public Gtk::Window { public: GlobalPortMatrixWindow (ARDOUR::Session&, ARDOUR::DataType);