X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fardour_ui_mixer.cc;h=93e1e6000427598e2a6fb396cfa16361c2193712;hb=50303d90bdcc329efe2e6d09b48c480a9bc2ba3b;hp=009442f76904ede21ebb5c267544674b4fccc75a;hpb=02be98b3d614bbb156351f83dbd164d7d2fe071a;p=ardour.git

diff --git a/gtk2_ardour/ardour_ui_mixer.cc b/gtk2_ardour/ardour_ui_mixer.cc
index 009442f769..93e1e60004 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 "mixer_ui.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;
@@ -39,14 +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_unmap().connect (sigc::bind (sigc::ptr_fun (&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/toggle-mixer")));
+	// mixer->signal_event().connect (sigc::bind (sigc::ptr_fun (&Gtkmm2ext::Keyboard::catch_user_event_for_pre_dialog_focus), mixer));
 
 	return 0;
 }
@@ -64,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;
 }