use lucida grande for clocks with all OS X versions, BUT BETTER

[ardour.git] / gtk2_ardour / return_ui.cc

diff --git a/gtk2_ardour/return_ui.cc b/gtk2_ardour/return_ui.cc
index 6e131c3b58bd7b6d4908304bf5dafbd404ec2f86..8120534b7d0f1294ad9170bcceec68a06f76020b 100644 (file)
--- a/gtk2_ardour/return_ui.cc
+++ b/gtk2_ardour/return_ui.cc
@@ -19,10 +19,9 @@
 
 #include <gtkmm2ext/doi.h>
 
-#include "ardour/amp.h"
 #include "ardour/io.h"
-#include "ardour/return.h"
 #include "ardour/rc_configuration.h"
+#include "ardour/return.h"
 
 #include "utils.h"
 #include "return_ui.h"
@@ -59,7 +58,7 @@ ReturnUI::ReturnUI (Gtk::Window* parent, boost::shared_ptr<Return> r, Session* s
        show_all ();
 
        _return->set_metering (true);
-       _return->input()->changed.connect (input_change_connection, invalidator (*this), ui_bind (&ReturnUI::ins_changed, this, _1, _2), gui_context());
+       _return->input()->changed.connect (input_change_connection, invalidator (*this), boost::bind (&ReturnUI::ins_changed, this, _1, _2), gui_context());
 
        _gpm.setup_meters ();
        _gpm.set_fader_name ("ReturnUIFrame");
@@ -79,7 +78,7 @@ ReturnUI::~ReturnUI ()
 }
 
 void
-ReturnUI::ins_changed (IOChange change, void* ignored)
+ReturnUI::ins_changed (IOChange change, void* /*ignored*/)
 {
        ENSURE_GUI_THREAD (*this, &ReturnUI::ins_changed, change, ignored)
        if (change.type & IOChange::ConfigurationChanged) {
@@ -101,14 +100,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");
 
@@ -125,7 +123,7 @@ void
 ReturnUIWindow::return_going_away ()
 {
        ENSURE_GUI_THREAD (*this, &ReturnUIWindow::return_going_away)
-       going_away_connection.disconnect ();    
+       going_away_connection.disconnect ();
        delete_when_idle (this);
 }