diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2007-11-30 22:12:27 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-11-30 22:12:27 +0000 |
| commit | 577f1571f8e8cf0dc5f6983ea5dd07cc6153f831 (patch) | |
| tree | 1d904943ab3a5eb79c92e9babb7cc9fa72d4f5de /gtk2_ardour/utils.cc | |
| parent | ff519d31b43251d0e5cea6c992a6dbc6dd0b90ba (diff) | |
don't put NDF/DF in clocks if there is no DF/NDF alternative; make deselect-all and invert-selection operations work properly; fix bug in edit range determination with no selected marker; popup dialog when no range can be determined; add new WINDOW modifier to SConscript to allow different conventions on OS X and linux
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2730 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/utils.cc')
| -rw-r--r-- | gtk2_ardour/utils.cc | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc index ed460a5864..686c8e521c 100644 --- a/gtk2_ardour/utils.cc +++ b/gtk2_ardour/utils.cc @@ -487,7 +487,7 @@ key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey* ev) return true; } } - + if (!special_handling_of_unmodified_accelerators || ev->state & (Gdk::MOD1_MASK| Gdk::MOD3_MASK| @@ -495,7 +495,7 @@ key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey* ev) Gdk::MOD5_MASK| Gdk::CONTROL_MASK)) { - /* no special handling or modifiers in effect: accelerate first */ + /* no special handling or there are modifiers in effect: accelerate first */ #ifdef DEBUG_ACCELERATOR_HANDLING if (debug) { @@ -508,12 +508,17 @@ key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey* ev) } #endif if (!gtk_window_activate_key (win, ev)) { +#ifdef DEBUG_ACCELERATOR_HANDLING + if (debug) { + cerr << "\tnot accelerated, now propagate\n"; + } +#endif return gtk_window_propagate_key_event (win, ev); } else { #ifdef DEBUG_ACCELERATOR_HANDLING - if (debug) { - cerr << "\tnot handled\n"; - } + if (debug) { + cerr << "\taccelerated - done.\n"; + } #endif return true; } |