X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui_mixer.cc;h=4f5614e32a0e278ffb9879673833eae5424103e8;hb=f66f7ba136c8588e47b3381ab07353e85f4100bf;hp=56ecc057f0b3155df7076dfb498ce4c6ec096f36;hpb=4fc3d98af81c09c605048ec981d5f0c9dcd84d28;p=ardour.git diff --git a/gtk2_ardour/ardour_ui_mixer.cc b/gtk2_ardour/ardour_ui_mixer.cc index 56ecc057f0..4f5614e32a 100644 --- a/gtk2_ardour/ardour_ui_mixer.cc +++ b/gtk2_ardour/ardour_ui_mixer.cc @@ -23,12 +23,14 @@ is to cut down on the nasty compile times for these classes. */ +#include "gtkmm2ext/keyboard.h" + #include "actions.h" #include "ardour_ui.h" #include "mixer_ui.h" #include "meterbridge.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; using namespace PBD; @@ -39,13 +41,14 @@ ARDOUR_UI::create_mixer () { try { mixer = Mixer_UI::instance (); + mixer->StateChange.connect (sigc::mem_fun (*this, &ARDOUR_UI::tabbable_state_change)); } catch (failed_constructor& err) { return -1; } - mixer->signal_window_state_event().connect (sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::main_window_state_event_handler), false)); + // mixer->signal_event().connect (sigc::bind (sigc::ptr_fun (&Gtkmm2ext::Keyboard::catch_user_event_for_pre_dialog_focus), mixer)); return 0; } @@ -63,8 +66,6 @@ ARDOUR_UI::create_meterbridge () return -1; } - meterbridge->signal_window_state_event().connect (sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::main_window_state_event_handler), false)); - return 0; }