use moved version of reset_focus()

diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc
index 2455d50cccc832b3a2e9a42ad7cad2068d94b704..ed81b6db2102d3cf40edd773c88a58a53cf09d89 100644 (file)
--- 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 3d85e463a72b6026f149347e1f196d877ab6b12d..6c18ced98b9d33c025276e15a589aa167a137113 100644 (file)
--- 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 b283ed3498056b59ac8407ece87950c8b567d29c..53f1b032aee7c8d77285d84a3ea5b1bb9559aeba 100644 (file)
--- 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;