NOOP, remove trailing tabs/whitespace.

[ardour.git] / gtk2_ardour / keyeditor.cc

diff --git a/gtk2_ardour/keyeditor.cc b/gtk2_ardour/keyeditor.cc
index e24eae5e979e603e506ef9cdebafc3aaad2c86fe..cbbbfafc730ee0775253884b3a0786472f452123 100644 (file)
--- a/gtk2_ardour/keyeditor.cc
+++ b/gtk2_ardour/keyeditor.cc
@@ -93,10 +93,10 @@ KeyEditor::KeyEditor ()
                unbind_button.show ();
 
        }
-       
+
        reset_button.add (reset_label);
        reset_label.set_markup (string_compose ("<span size=\"large\" weight=\"bold\">%1</span>", _("Reset Bindings to Defaults")));
-                               
+
        reset_box.pack_start (reset_button, true, false);
        reset_box.show ();
        reset_button.show ();
@@ -184,7 +184,7 @@ KeyEditor::on_key_press_event (GdkEventKey* ev)
        if (!ev->is_modifier) {
                last_keyval = ev->keyval;
        }
-       return false;
+       return ArdourWindow::on_key_press_event (ev);
 }
 
 bool
@@ -203,11 +203,14 @@ KeyEditor::on_key_release_event (GdkEventKey* ev)
                        goto out;
                }
 
+               GdkModifierType mod = (GdkModifierType)(Keyboard::RelevantModifierKeyMask & ev->state);
+
                Gtkmm2ext::possibly_translate_keyval_to_make_legal_accelerator (ev->keyval);
+               Gtkmm2ext::possibly_translate_mod_to_make_legal_accelerator (mod);
 
                bool result = AccelMap::change_entry (path,
                                                      last_keyval,
-                                                     ModifierType (Keyboard::RelevantModifierKeyMask & ev->state),
+                                                     Gdk::ModifierType(mod),
                                                      true);
 
                if (result) {
@@ -310,4 +313,7 @@ void
 KeyEditor::reset ()
 {
        Keyboard::the_keyboard().reset_bindings ();
+       populate ();
+       view.get_selection()->unselect_all ();
+       populate ();
 }