diff options
| -rw-r--r-- | gtk2_ardour/ardour_ui_dependents.cc | 1 | ||||
| -rw-r--r-- | gtk2_ardour/ardour_ui_ed.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/editor.cc | 9 | ||||
| -rw-r--r-- | gtk2_ardour/editor.h | 1 | ||||
| -rw-r--r-- | gtk2_ardour/main.cc | 7 | ||||
| -rw-r--r-- | gtk2_ardour/option_editor.cc | 8 | ||||
| -rw-r--r-- | gtk2_ardour/option_editor.h | 2 |
7 files changed, 15 insertions, 15 deletions
diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc index a2661e71d6..45a047f1d1 100644 --- a/gtk2_ardour/ardour_ui_dependents.cc +++ b/gtk2_ardour/ardour_ui_dependents.cc @@ -52,6 +52,7 @@ ARDOUR_UI::shutdown () void ARDOUR_UI::we_have_dependents () { + cerr << "have dependents\n"; setup_keybindings (); } diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc index 8572f9b650..04d059b31f 100644 --- a/gtk2_ardour/ardour_ui_ed.cc +++ b/gtk2_ardour/ardour_ui_ed.cc @@ -69,8 +69,6 @@ ARDOUR_UI::install_actions () act = ActionManager::register_action (main_actions, X_("New"), _("New"), bind (mem_fun(*this, &ARDOUR_UI::new_session), false, string ())); - cerr << "\n\n\n NEW has accel path " << act->get_accel_path() << endl; - ActionManager::register_action (main_actions, X_("Open"), _("Open"), mem_fun(*this, &ARDOUR_UI::open_session)); ActionManager::register_action (main_actions, X_("Recent"), _("Recent"), mem_fun(*this, &ARDOUR_UI::open_recent_session)); act = ActionManager::register_action (main_actions, X_("Close"), _("Close"), mem_fun(*this, &ARDOUR_UI::close_session)); diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index e8aaee5b99..508cce1557 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -796,7 +796,8 @@ void Editor::show_window () { show_all (); - + present (); + /* now reset all audio_time_axis heights, because widgets might need to be re-hidden */ @@ -4097,9 +4098,3 @@ Editor::transport_punch_location() return 0; } } - -void -Editor::on_map () -{ - // XXX remove me -} diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 185059593b..547bca13ae 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -307,7 +307,6 @@ class Editor : public PublicEditor void map_position_change (jack_nframes_t); void on_realize(); - void on_map (); private: diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc index 9d3a246f86..05394f8b0f 100644 --- a/gtk2_ardour/main.cc +++ b/gtk2_ardour/main.cc @@ -27,6 +27,7 @@ #include <unistd.h> #include <sigc++/bind.h> +#include <gtkmm/settings.h> #include <pbd/error.h> #include <pbd/textreceiver.h> @@ -185,6 +186,8 @@ catch_signals (void) pthread_t signal_thread_id; sigset_t signals; + return 0; + // if (setpgid (0,0)) { if (setsid ()) { warning << string_compose (_("cannot become new process group leader (%1)"), @@ -358,6 +361,10 @@ main (int argc, char *argv[]) gtk_rc_set_default_files (null_file_list); + // allow run-time rebinding of accels + + Settings::get_default()->property_gtk_can_change_accels() = true; + cout << _("Ardour/GTK ") << VERSIONSTRING << _("\n (built using ") diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc index 803e17d79b..99dcbd0535 100644 --- a/gtk2_ardour/option_editor.cc +++ b/gtk2_ardour/option_editor.cc @@ -71,7 +71,7 @@ static vector<string> layer_mode_strings; static vector<string> xfade_model_strings; OptionEditor::OptionEditor (ARDOUR_UI& uip, PublicEditor& ed, Mixer_UI& mixui) - : ArdourDialog ("option editor"), + : Dialog ("option editor"), ui (uip), editor (ed), mixer (mixui), @@ -159,8 +159,7 @@ OptionEditor::OptionEditor (ARDOUR_UI& uip, PublicEditor& ed, Mixer_UI& mixui) layer_mode_label.set_name ("OptionsLabel"); xfade_model_label.set_name ("OptionsLabel"); - VBox *vbox = manage(new VBox); - add (*vbox); + VBox *vbox = get_vbox(); set_border_width (3); vbox->set_spacing (4); @@ -197,6 +196,7 @@ OptionEditor::OptionEditor (ARDOUR_UI& uip, PublicEditor& ed, Mixer_UI& mixui) } set_session (0); + show_all_children(); } void @@ -1398,7 +1398,7 @@ OptionEditor::strip_width_clicked () void OptionEditor::just_close_win() { - hide_all(); + hide(); } void diff --git a/gtk2_ardour/option_editor.h b/gtk2_ardour/option_editor.h index 6eabe6a4c9..3cce36611d 100644 --- a/gtk2_ardour/option_editor.h +++ b/gtk2_ardour/option_editor.h @@ -46,7 +46,7 @@ class IOSelector; class GainMeter; class PannerUI; -class OptionEditor : public ArdourDialog +class OptionEditor : public Gtk::Dialog { public: OptionEditor (ARDOUR_UI&, PublicEditor&, Mixer_UI&); |