Move panner bypass state up to the PannerShell so that it is preserved even when...

[ardour.git] / gtk2_ardour / ardour_dialog.cc

diff --git a/gtk2_ardour/ardour_dialog.cc b/gtk2_ardour/ardour_dialog.cc
index c3d238a9c0f3f33b8e3916250478c24340c174c1..cd95666b16f120b3fd85fa2c5b12cc12b4ce68cc 100644 (file)
--- a/gtk2_ardour/ardour_dialog.cc
+++ b/gtk2_ardour/ardour_dialog.cc
@@ -29,8 +29,9 @@
 #include "public_editor.h"
 #include "utils.h"
 
-using namespace sigc;
+using namespace std;
 using namespace Gtk;
+using namespace Gtkmm2ext;
 
 sigc::signal<void> ArdourDialog::CloseAllDialogs;
 
@@ -86,13 +87,12 @@ ArdourDialog::on_show ()
        Dialog::on_show ();
 }
 
-void 
+void
 ArdourDialog::init ()
 {
-       session = 0;
        set_type_hint(Gdk::WINDOW_TYPE_HINT_DIALOG);
        set_border_width (10);
-       CloseAllDialogs.connect (bind (mem_fun (*this, &ArdourDialog::response), RESPONSE_CANCEL));
+       CloseAllDialogs.connect (sigc::bind (sigc::mem_fun (*this, &ArdourDialog::response), RESPONSE_CANCEL));
 }
 
 bool