destroy splash when hiding it to workaround odd bug on OS X where the window will...

[ardour.git] / gtk2_ardour / ardour_ui2.cc

diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc
index 6013dca222c77316ee5eb690f069a2bfb05196af..19e8a8ce6f02c79e0fe60a5d5de3e4435841bee7 100644 (file)
--- a/gtk2_ardour/ardour_ui2.cc
+++ b/gtk2_ardour/ardour_ui2.cc
@@ -37,11 +37,9 @@
 #include <gtkmm2ext/click_box.h>
 #include <gtkmm2ext/tearoff.h>
 
-#include "ardour/session.h"
-#include "ardour/audioengine.h"
-#include "ardour/ardour.h"
 #include "ardour/profile.h"
-#include "ardour/route.h"
+#include "ardour/session.h"
+#include "ardour/types.h"
 
 #include "ardour_ui.h"
 #include "keyboard.h"
@@ -49,6 +47,7 @@
 #include "audio_clock.h"
 #include "actions.h"
 #include "button_joiner.h"
+#include "main_clock.h"
 #include "utils.h"
 #include "theme_manager.h"
 #include "midi_tracer.h"
@@ -261,7 +260,7 @@ ARDOUR_UI::setup_transport ()
        click_button.set_name ("transport active option button");
        sync_button.set_name ("transport active option button");
 
-       stop_button.set_active_state (Active);
+       stop_button.set_active (true);
 
        goto_start_button.set_image (get_icon (X_("transport_start")));
        goto_end_button.set_image (get_icon (X_("transport_end")));
@@ -341,6 +340,7 @@ ARDOUR_UI::setup_transport ()
        transport_button_size_group->add_widget (rec_button);
        transport_button_size_group->add_widget (play_selection_button);
        transport_button_size_group->add_widget (roll_button);
+       transport_button_size_group->add_widget (stop_button);
 
        HBox* tbox1 = manage (new HBox);
        HBox* tbox2 = manage (new HBox);