From c8c6b185c246cc2aa12d7f58efe9573b075abf23 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 21 May 2012 12:53:32 +0000 Subject: [PATCH] fix click-activation of new/existing button action in startup wizard git-svn-id: svn://localhost/ardour2/branches/3.0@12359 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/startup.cc | 13 +++++-------- gtk2_ardour/startup.h | 2 +- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/gtk2_ardour/startup.cc b/gtk2_ardour/startup.cc index a75c336831..483512e8cd 100644 --- a/gtk2_ardour/startup.cc +++ b/gtk2_ardour/startup.cc @@ -549,10 +549,10 @@ ArdourStartup::setup_initial_choice_page () centering_vbox->pack_start (ic_new_session_button, false, true); centering_vbox->pack_start (ic_existing_session_button, false, true); - ic_new_session_button.signal_button_press_event().connect(sigc::mem_fun(*this, &ArdourStartup::initial_button_press), false); + ic_new_session_button.signal_clicked().connect(sigc::mem_fun(*this, &ArdourStartup::initial_button_clicked)); ic_new_session_button.signal_activate().connect(sigc::mem_fun(*this, &ArdourStartup::initial_button_activated), false); - ic_existing_session_button.signal_button_press_event().connect(sigc::mem_fun(*this, &ArdourStartup::initial_button_press), false); + ic_existing_session_button.signal_clicked().connect(sigc::mem_fun(*this, &ArdourStartup::initial_button_clicked)); ic_existing_session_button.signal_activate().connect(sigc::mem_fun(*this, &ArdourStartup::initial_button_activated), false); centering_hbox->pack_start (*centering_vbox, true, true); @@ -572,14 +572,11 @@ ArdourStartup::setup_initial_choice_page () set_page_complete (ic_vbox, true); } -bool -ArdourStartup::initial_button_press (GdkEventButton *event) +void +ArdourStartup::initial_button_clicked () { - if (event && session_page_index != -1) { + if (session_page_index != -1) { set_current_page(session_page_index); - return true; - } else { - return false; } } diff --git a/gtk2_ardour/startup.h b/gtk2_ardour/startup.h index 052a168a37..59f29604f0 100644 --- a/gtk2_ardour/startup.h +++ b/gtk2_ardour/startup.h @@ -117,7 +117,7 @@ class ArdourStartup : public Gtk::Assistant { Gtk::VBox ic_vbox; Gtk::RadioButton ic_new_session_button; Gtk::RadioButton ic_existing_session_button; - bool initial_button_press(GdkEventButton *); + void initial_button_clicked(); void initial_button_activated(); /* monitoring choices */