Properly revert FormatSpec changes on "cancel"

[ardour.git] / gtk2_ardour / ardour_ui_dependents.cc

diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc
index 0c052924bd5a7dba8940d88c95dd078733e4259e..ab2c3a9ef8f4f15d98728ac8ae5964c3642c675e 100644 (file)
--- a/gtk2_ardour/ardour_ui_dependents.cc
+++ b/gtk2_ardour/ardour_ui_dependents.cc
@@ -132,7 +132,7 @@ ARDOUR_UI::connect_dependents_to_session (ARDOUR::Session *s)
 gint
 ARDOUR_UI::exit_on_main_window_close (GdkEventAny * /*ev*/)
 {
-#ifdef TOP_MENUBAR
+#ifdef __APPLE__
        /* just hide the window, and return - the top menu stays up */
        editor->hide ();
        return TRUE;
@@ -153,7 +153,7 @@ ARDOUR_UI::tab_window_root_drop (GtkNotebook* src,
        using namespace std;
        Gtk::Notebook* nb = 0;
        Gtk::Window* win = 0;
-       Gtkmm2ext::Tabbable* tabbable = 0;
+       ArdourWidgets::Tabbable* tabbable = 0;
 
 
        if (w == GTK_WIDGET(editor->contents().gobj())) {
@@ -219,10 +219,10 @@ ARDOUR_UI::main_window_delete_event (GdkEventAny* ev)
 
 static GtkNotebook*
 tab_window_root_drop (GtkNotebook* src,
-                     GtkWidget* w,
-                     gint x,
-                     gint y,
-                     gpointer user_data)
+                      GtkWidget* w,
+                      gint x,
+                      gint y,
+                      gpointer user_data)
 {
        return ARDOUR_UI::instance()->tab_window_root_drop (src, w, x, y, user_data);
 }
@@ -271,43 +271,28 @@ ARDOUR_UI::setup_windows ()
        mixer->add_to_notebook (_tabs, _("Mixer"));
        editor->add_to_notebook (_tabs, _("Editor"));
 
-       time_info_box = new TimeInfoBox (false);
+       time_info_box = new TimeInfoBox ("ToolbarTimeInfo", false);
        /* all other dialogs are created conditionally */
 
        we_have_dependents ();
 
-#ifdef TOP_MENUBAR
-       EventBox* status_bar_event_box = manage (new EventBox);
-
-       status_bar_event_box->add (status_bar_label);
-       status_bar_event_box->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
-       status_bar_label.set_size_request (300, -1);
-
-       status_bar_label.show ();
-       status_bar_event_box->show ();
-
-       status_bar_event_box->signal_button_press_event().connect (mem_fun (*this, &ARDOUR_UI::status_bar_button_press));
-
-       status_bar_hpacker.pack_start (*status_bar_event_box, true, true, 6);
-       status_bar_hpacker.pack_start (menu_bar_base, false, false, 2);
-#else
        top_packer.pack_start (menu_bar_base, false, false);
-#endif
 
        main_vpacker.pack_start (top_packer, false, false);
 
-       /* now add the transport frame to the top of main window */
+       ArdourWidgets::ArdourDropShadow *spacer = manage (new (ArdourWidgets::ArdourDropShadow));
+       spacer->set_size_request( -1, 4 );
+       spacer->show();
+
+       /* now add the transport sample to the top of main window */
 
+       main_vpacker.pack_start ( *spacer, false, false);
        main_vpacker.pack_start (transport_frame, false, false);
        main_vpacker.pack_start (_tabs, true, true);
 
-#ifdef TOP_MENUBAR
-       main_vpacker.pack_start (status_bar_hpacker, false, false);
-#endif
-
        LuaInstance::instance()->ActionChanged.connect (sigc::mem_fun (*this, &ARDOUR_UI::update_action_script_btn));
 
-       for (int i = 0; i < 9; ++i) {
+       for (int i = 0; i < MAX_LUA_ACTION_SCRIPTS; ++i) {
                std::string const a = string_compose (X_("script-action-%1"), i + 1);
                Glib::RefPtr<Action> act = ActionManager::get_action(X_("Editor"), a.c_str());
                assert (act);