diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2015-07-07 22:12:21 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-02-22 15:31:21 -0500 |
| commit | 9010262bed21611f2db652d16f63e4af4380259d (patch) | |
| tree | b112724d2b26eb3b66b5e1c5571dbf6c5509cc24 /gtk2_ardour/floating_text_entry.cc | |
| parent | 85eee3b09dd53f6f5d1803f2b585270ab535e16f (diff) | |
first compilable version of tabbable design.
I would have loved to split this apart, but there are just so many interrelated changes,
it makes little sense and would be a huge effort that would break future git bisect
use because so many intermediate commits would not compile
Diffstat (limited to 'gtk2_ardour/floating_text_entry.cc')
| -rw-r--r-- | gtk2_ardour/floating_text_entry.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/gtk2_ardour/floating_text_entry.cc b/gtk2_ardour/floating_text_entry.cc index d264ee930b..60f10e571b 100644 --- a/gtk2_ardour/floating_text_entry.cc +++ b/gtk2_ardour/floating_text_entry.cc @@ -27,7 +27,7 @@ #include "i18n.h" -FloatingTextEntry::FloatingTextEntry (const std::string& initial_contents) +FloatingTextEntry::FloatingTextEntry (Gtk::Window* parent, const std::string& initial_contents) : Gtk::Window (Gtk::WINDOW_POPUP) , entry_changed (false) { @@ -44,7 +44,10 @@ FloatingTextEntry::FloatingTextEntry (const std::string& initial_contents) entry.signal_activate().connect (sigc::mem_fun (*this, &FloatingTextEntry::activated)); entry.signal_key_press_event().connect (sigc::mem_fun (*this, &FloatingTextEntry::key_press)); entry.signal_button_press_event().connect (sigc::mem_fun (*this, &FloatingTextEntry::button_press)); - PublicEditor::instance ().signal_focus_out_event().connect (sigc::mem_fun (*this, &FloatingTextEntry::entry_focus_out)); + + if (parent) { + parent->signal_focus_out_event().connect (sigc::mem_fun (*this, &FloatingTextEntry::entry_focus_out)); + } add (entry); } |