rework dialog-close-focus-reset change to work in Tabbed

diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
index 16e1edd68e2825d22ac53ea5eb33afa3e609a43a..f091d070ca56dcbc4eca2eaf72a7b03a5d055370 100644 (file)
--- a/gtk2_ardour/ardour_ui_ed.cc
+++ b/gtk2_ardour/ardour_ui_ed.cc
@@ -88,7 +88,7 @@ ARDOUR_UI::create_editor ()
                return -1;
        }
 
-        editor->signal_event().connect (sigc::bind (sigc::ptr_fun (&Keyboard::catch_user_event_for_pre_dialog_focus), editor));
+       // editor->signal_event().connect (sigc::bind (sigc::ptr_fun (&Keyboard::catch_user_event_for_pre_dialog_focus), editor));
 
        return 0;
 }

diff --git a/gtk2_ardour/ardour_ui_mixer.cc b/gtk2_ardour/ardour_ui_mixer.cc
index 6279f4c789439ecad791d644ad29747a33f56b56..921cd7bc57dedec2d0ab6d343cdf17547ac5256a 100644 (file)
--- a/gtk2_ardour/ardour_ui_mixer.cc
+++ b/gtk2_ardour/ardour_ui_mixer.cc
@@ -48,7 +48,7 @@ ARDOUR_UI::create_mixer ()
                return -1;
        }
 
-        mixer->signal_event().connect (sigc::bind (sigc::ptr_fun (&Gtkmm2ext::Keyboard::catch_user_event_for_pre_dialog_focus), mixer));
+       // mixer->signal_event().connect (sigc::bind (sigc::ptr_fun (&Gtkmm2ext::Keyboard::catch_user_event_for_pre_dialog_focus), mixer));
 
        return 0;
 }

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 22c7c2ea560077160fc15880a46b57353b3696a6..0cb7b05dcbc1ca832e62027619cdc9a249af3e2b 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -59,6 +59,7 @@
 #include "gtkmm2ext/bindings.h"
 #include "gtkmm2ext/grouped_buttons.h"
 #include "gtkmm2ext/gtk_ui.h"
+#include <gtkmm2ext/keyboard.h>
 #include "gtkmm2ext/utils.h"
 #include "gtkmm2ext/window_title.h"
 #include "gtkmm2ext/choice.h"
@@ -5856,6 +5857,7 @@ Editor::use_own_window (bool and_fill_it)
                ARDOUR_UI::instance()->setup_toplevel_window (*win, _("Editor"), this);
 
                // win->signal_realize().connect (*this, &Editor::on_realize);
+               win->signal_event().connect (sigc::bind (sigc::ptr_fun (&Keyboard::catch_user_event_for_pre_dialog_focus), win));
                win->signal_event().connect (sigc::mem_fun (*this, &Editor::generic_event_handler));
                win->set_data ("ardour-bindings", bindings);
 

diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc
index d7a4fc791734a08751427be5f0a99837072d1e53..1f5a627936d2f12cce8927ba825c0539e9b01d02 100644 (file)
--- a/gtk2_ardour/mixer_ui.cc
+++ b/gtk2_ardour/mixer_ui.cc
@@ -34,6 +34,7 @@
 #include <glibmm/threads.h>
 
 #include <gtkmm2ext/gtk_ui.h>
+#include <gtkmm2ext/keyboard.h>
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/tearoff.h>
 #include <gtkmm2ext/window_title.h>
@@ -317,6 +318,7 @@ Mixer_UI::use_own_window (bool and_fill_it)
                win->set_name ("MixerWindow");
                ARDOUR_UI::instance()->setup_toplevel_window (*win, _("Mixer"), this);
                win->signal_scroll_event().connect (sigc::mem_fun (*this, &Mixer_UI::on_scroll_event), false);
+               win->signal_event().connect (sigc::bind (sigc::ptr_fun (&Keyboard::catch_user_event_for_pre_dialog_focus), win));
                win->set_data ("ardour-bindings", bindings);
                update_title ();
        }