From 6fd66bd46768f205e4eb02d6e14ef4a3a20700d2 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 2 May 2013 21:13:36 -0400 Subject: move CloseAllDialogs signal and associated method from ArdourDialog to ARDOUR_UI, and make ArdourWindow obey it too --- gtk2_ardour/ardour_dialog.cc | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'gtk2_ardour/ardour_dialog.cc') diff --git a/gtk2_ardour/ardour_dialog.cc b/gtk2_ardour/ardour_dialog.cc index 87b48d986a..cd7d0fbd55 100644 --- a/gtk2_ardour/ardour_dialog.cc +++ b/gtk2_ardour/ardour_dialog.cc @@ -23,6 +23,7 @@ #include #include "ardour_dialog.h" +#include "ardour_ui.h" #include "keyboard.h" #include "splash.h" @@ -30,8 +31,6 @@ using namespace std; using namespace Gtk; using namespace Gtkmm2ext; -sigc::signal ArdourDialog::CloseAllDialogs; - ArdourDialog::ArdourDialog (string title, bool modal, bool use_seperator) : Dialog (title, modal, use_seperator) , _splash_pushed (false) @@ -98,9 +97,7 @@ ArdourDialog::on_show () void ArdourDialog::init () { - set_type_hint(Gdk::WINDOW_TYPE_HINT_DIALOG); set_border_width (10); - CloseAllDialogs.connect ( - sigc::bind (sigc::mem_fun (*this, &ArdourDialog::response), - RESPONSE_CANCEL)); + // set_type_hint (Gdk::WINDOW_TYPE_HINT_DIALOG); + ARDOUR_UI::CloseAllDialogs.connect (sigc::bind (sigc::mem_fun (*this, &ArdourDialog::response), RESPONSE_CANCEL)); } -- cgit v1.2.3