From 54991c5b14cec5684b8dab74be7975e84478c7de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ed=C3=AAnis=20Freindorfer=20Azevedo?= Date: Wed, 4 Sep 2019 15:50:31 -0300 Subject: [PATCH] Add extra keys default input when using GUI. We also set the extra keys for controller input when using `defaults` option. --- src/wx/guiinit.cpp | 3 +++ src/wx/opts.h | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/wx/guiinit.cpp b/src/wx/guiinit.cpp index 00f06074..0529ecf8 100644 --- a/src/wx/guiinit.cpp +++ b/src/wx/guiinit.cpp @@ -1672,6 +1672,9 @@ public: if (defkeys_joystick[i].joy) a.push_back(defkeys_joystick[i]); + if (extrakeys_joystick[i].joy) + a.push_back(extrakeys_joystick[i]); + tc->SetValue(wxJoyKeyTextCtrl::ToString(a)); } } diff --git a/src/wx/opts.h b/src/wx/opts.h index e24c525f..6ecca174 100644 --- a/src/wx/opts.h +++ b/src/wx/opts.h @@ -3,8 +3,9 @@ #define NUM_KEYS 21 extern const wxString joynames[NUM_KEYS]; -extern wxJoyKeyBinding defkeys_keyboard[NUM_KEYS]; // keyboard defaults -extern wxJoyKeyBinding defkeys_joystick[NUM_KEYS]; // joystick defaults +extern wxJoyKeyBinding defkeys_keyboard[NUM_KEYS]; // keyboard defaults +extern wxJoyKeyBinding defkeys_joystick[NUM_KEYS]; // joystick defaults +extern wxJoyKeyBinding extrakeys_joystick[NUM_KEYS];// extra joystick defaults extern struct opts_t { opts_t();