smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-08 15:54:57 +01:00
Code Issues Projects Releases Wiki Activity

use moved version of reset_focus()

Browse source
This commit is contained in:
Paul Davis 2016-09-06 16:17:39 -04:00
parent 07bb5ff347
commit c9ece0d6c6
3 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gtk2_ardour/audio_clock.cc
View file

@ -37,10 +37,10 @@
#include "ardour/tempo.h" #include "ardour/tempo.h"
#include "ardour/types.h" #include "ardour/types.h"
#include "ardour_ui.h"
#include "audio_clock.h" #include "audio_clock.h"
#include "gui_thread.h" #include "gui_thread.h"
#include "keyboard.h" #include "keyboard.h"
#include "public_editor.h"
#include "ui_config.h" #include "ui_config.h"
#include "utils.h" #include "utils.h"
@ -712,7 +712,7 @@ AudioClock::drop_focus ()
if (has_focus()) { if (has_focus()) {
/* move focus back to the default widget in the top level window */ /* move focus back to the default widget in the top level window */
PublicEditor::instance().reset_focus (this); ARDOUR_UI::instance()->reset_focus (this);
} }
} }

4
gtk2_ardour/big_clock_window.cc
View file

@ -21,6 +21,8 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include "gtkmm2ext/utils.h"
#include "ardour_ui.h" #include "ardour_ui.h"
#include "audio_clock.h" #include "audio_clock.h"
#include "big_clock_window.h" #include "big_clock_window.h"
@ -55,7 +57,7 @@ void
BigClockWindow::on_unmap () BigClockWindow::on_unmap ()
{ {
ArdourWindow::on_unmap (); ArdourWindow::on_unmap ();
PublicEditor::instance().reset_focus (&clock); ARDOUR_UI::instance()->reset_focus (this);
} }
bool bool

4
gtk2_ardour/editor.cc
View file

@ -572,7 +572,7 @@ Editor::Editor ()
initialize_canvas (); 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); _summary = new EditorSummary (this);
@ -1182,7 +1182,7 @@ Editor::generic_event_handler (GdkEvent* ev)
/* leaving window, so reset focus, thus ending any and /* leaving window, so reset focus, thus ending any and
all text entry operations. all text entry operations.
*/ */
reset_focus (&contents()); ARDOUR_UI::instance()->reset_focus (&contents());
break; break;
} }
break; break;