projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make inclusion/exclusion of hidden children optional in Item::add_child_bounding_boxes
[ardour.git]
/
gtk2_ardour
/
ardour_ui_mixer.cc
diff --git
a/gtk2_ardour/ardour_ui_mixer.cc
b/gtk2_ardour/ardour_ui_mixer.cc
index 56ecc057f0b3155df7076dfb498ce4c6ec096f36..4f5614e32a0e278ffb9879673833eae5424103e8 100644
(file)
--- 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.
*/
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 "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;
using namespace ARDOUR;
using namespace PBD;
@@
-39,13
+41,14
@@
ARDOUR_UI::create_mixer ()
{
try {
mixer = Mixer_UI::instance ();
{
try {
mixer = Mixer_UI::instance ();
+ mixer->StateChange.connect (sigc::mem_fun (*this, &ARDOUR_UI::tabbable_state_change));
}
catch (failed_constructor& err) {
return -1;
}
}
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;
}
return 0;
}
@@
-63,8
+66,6
@@
ARDOUR_UI::create_meterbridge ()
return -1;
}
return -1;
}
- meterbridge->signal_window_state_event().connect (sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::main_window_state_event_handler), false));
-
return 0;
}
return 0;
}