diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-09-06 16:17:39 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-09-06 16:17:39 -0400 |
| commit | c9ece0d6c68560ea263ebda40dd9f1963fef0c45 (patch) | |
| tree | 92336f95550dc51e927749f6ca6cbbc8a6aca7e2 | |
| parent | 07bb5ff34735962bcfea9751420ade3af8be5d5c (diff) | |
use moved version of reset_focus()
| -rw-r--r-- | gtk2_ardour/audio_clock.cc | 4 | ||||
| -rw-r--r-- | gtk2_ardour/big_clock_window.cc | 4 | ||||
| -rw-r--r-- | gtk2_ardour/editor.cc | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc index 2455d50ccc..ed81b6db21 100644 --- a/gtk2_ardour/audio_clock.cc +++ b/gtk2_ardour/audio_clock.cc @@ -37,10 +37,10 @@ #include "ardour/tempo.h" #include "ardour/types.h" +#include "ardour_ui.h" #include "audio_clock.h" #include "gui_thread.h" #include "keyboard.h" -#include "public_editor.h" #include "ui_config.h" #include "utils.h" @@ -712,7 +712,7 @@ AudioClock::drop_focus () if (has_focus()) { /* move focus back to the default widget in the top level window */ - PublicEditor::instance().reset_focus (this); + ARDOUR_UI::instance()->reset_focus (this); } } diff --git a/gtk2_ardour/big_clock_window.cc b/gtk2_ardour/big_clock_window.cc index 3d85e463a7..6c18ced98b 100644 --- a/gtk2_ardour/big_clock_window.cc +++ b/gtk2_ardour/big_clock_window.cc @@ -21,6 +21,8 @@ #include <string> #include <vector> +#include "gtkmm2ext/utils.h" + #include "ardour_ui.h" #include "audio_clock.h" #include "big_clock_window.h" @@ -55,7 +57,7 @@ void BigClockWindow::on_unmap () { ArdourWindow::on_unmap (); - PublicEditor::instance().reset_focus (&clock); + ARDOUR_UI::instance()->reset_focus (this); } bool diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index b283ed3498..53f1b032ae 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -572,7 +572,7 @@ Editor::Editor () initialize_canvas (); - CairoWidget::set_focus_handler (sigc::mem_fun (*this, &Editor::reset_focus)); + CairoWidget::set_focus_handler (sigc::mem_fun (ARDOUR_UI::instance(), &ARDOUR_UI::reset_focus)); _summary = new EditorSummary (this); @@ -1182,7 +1182,7 @@ Editor::generic_event_handler (GdkEvent* ev) /* leaving window, so reset focus, thus ending any and all text entry operations. */ - reset_focus (&contents()); + ARDOUR_UI::instance()->reset_focus (&contents()); break; } break; |