summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2012-12-27 16:40:39 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2012-12-27 16:40:39 +0000
commit5088d3b59bf9e06d8c682e6a706d5d6a9b99bf4d (patch)
tree7ab37542d7cd88d87d23d0f0d3f42153d1f4c2de
parent4481cca74a6003cdcc982e5677adcbbdbf1e617d (diff)
fix lack of focus in new session name entry by removing previous efforts to fix it!
git-svn-id: svn://localhost/ardour2/branches/3.0@13739 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r--gtk2_ardour/startup.cc20
-rw-r--r--gtk2_ardour/startup.h1
2 files changed, 2 insertions, 19 deletions
diff --git a/gtk2_ardour/startup.cc b/gtk2_ardour/startup.cc
index 2192005b48..328e06c9c0 100644
--- a/gtk2_ardour/startup.cc
+++ b/gtk2_ardour/startup.cc
@@ -31,6 +31,7 @@
#include "pbd/file_utils.h"
#include "pbd/replace_all.h"
#include "pbd/whitespace.h"
+#include "pbd/stacktrace.h"
#include "ardour/filesystem_paths.h"
#include "ardour/recent_sessions.h"
@@ -719,13 +720,6 @@ ArdourStartup::populate_session_templates ()
}
}
-static bool
-lost_name_entry_focus (GdkEventFocus*)
-{
- // cerr << "lost focus\n";
- return false;
-}
-
void
ArdourStartup::setup_new_session_page ()
{
@@ -790,7 +784,7 @@ ArdourStartup::setup_new_session_page ()
#endif
vbox1->pack_start (*hbox2, false, false);
-
+
session_new_vbox.pack_start (*vbox1, false, false);
/* --- */
@@ -890,16 +884,6 @@ ArdourStartup::setup_new_session_page ()
if (more_new_session_options_button.get_active()) {
set_page_type (session_vbox, ASSISTANT_PAGE_CONTENT);
}
-
- new_name_entry.signal_map().connect (sigc::mem_fun (*this, &ArdourStartup::new_name_mapped));
- new_name_entry.signal_focus_out_event().connect (sigc::ptr_fun (lost_name_entry_focus));
-}
-
-void
-ArdourStartup::new_name_mapped ()
-{
- // cerr << "Grab new name focus\n";
- new_name_entry.grab_focus ();
}
void
diff --git a/gtk2_ardour/startup.h b/gtk2_ardour/startup.h
index 00c0a90d39..60da52fd6f 100644
--- a/gtk2_ardour/startup.h
+++ b/gtk2_ardour/startup.h
@@ -184,7 +184,6 @@ class ArdourStartup : public Gtk::Assistant {
Gtk::Entry new_name_entry;
Gtk::FileChooserButton new_folder_chooser;
Gtk::FileChooserButton session_template_chooser;
- void new_name_mapped ();
struct SessionTemplateColumns : public Gtk::TreeModel::ColumnRecord {
SessionTemplateColumns () {