diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-02-22 14:42:17 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-02-22 15:31:26 -0500 |
| commit | 21c3d17ae15373ae9eaabf17e3e6b5e946b82fdd (patch) | |
| tree | cb7ae543be353460cfd53e29b1b7d6243bae74a7 | |
| parent | ff9bb1886afd655577ee1f45f4b57574e0c07675 (diff) | |
fix merge/rebase mistake
| -rw-r--r-- | libs/gtkmm2ext/keyboard.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libs/gtkmm2ext/keyboard.cc b/libs/gtkmm2ext/keyboard.cc index 690ea024cf..7975fdebd7 100644 --- a/libs/gtkmm2ext/keyboard.cc +++ b/libs/gtkmm2ext/keyboard.cc @@ -112,6 +112,7 @@ bool Keyboard::bindings_changed_after_save_became_legal = false; map<string,string> Keyboard::binding_files; string Keyboard::_current_binding_name; string Keyboard::binding_filename_suffix = X_(".keys"); +Gtk::Window* Keyboard::pre_dialog_active_window = 0; /* set this to initially contain the modifiers we care about, then track changes in ::set_edit_modifier() etc. */ GdkModifierType Keyboard::RelevantModifierKeyMask; |