diff --git a/src/wx/guiinit.cpp b/src/wx/guiinit.cpp
index 2137e7a9..e1b6a5d4 100644
--- a/src/wx/guiinit.cpp
+++ b/src/wx/guiinit.cpp
@@ -1646,6 +1646,18 @@ public:
{
bool clear = ev.GetId() == XRCID("Clear");
+ // For the individual clear buttons, we assume their name is
+ // "Clear" + joynames[i]
+ // ClearUp for Up; ClearR for R etc
+ for (int i = 0; i < NUM_KEYS; ++i) {
+ wxJoyKeyTextCtrl* tc = XRCCTRL_D(*p, joynames[i], wxJoyKeyTextCtrl);
+ wxString singleClearButton("Clear" + joynames[i]);
+ if (ev.GetId() == XRCID(singleClearButton)) {
+ tc->SetValue(wxEmptyString);
+ return;
+ }
+ }
+
for (int i = 0; i < NUM_KEYS; i++) {
wxJoyKeyTextCtrl* tc = XRCCTRL_D(*p, joynames[i], wxJoyKeyTextCtrl);
@@ -3725,6 +3737,12 @@ bool MainFrame::BindControls()
w->Connect(XRCID("Clear"), wxEVT_COMMAND_BUTTON_CLICKED,
wxCommandEventHandler(JoyPadConfig_t::JoypadConfigButtons),
NULL, &JoyPadConfigHandler[i]);
+ for (int j = 0; j < NUM_KEYS; ++j) {
+ w->Connect(XRCID(wxString("Clear" + joynames[j])),
+ wxEVT_COMMAND_BUTTON_CLICKED,
+ wxCommandEventHandler(JoyPadConfig_t::JoypadConfigButtons),
+ NULL, &JoyPadConfigHandler[i]);
+ }
joyDialog->Fit();
}
diff --git a/src/wx/xrc/JoyPanel.xrc b/src/wx/xrc/JoyPanel.xrc
index 9d11b18f..79aa1bf5 100644
--- a/src/wx/xrc/JoyPanel.xrc
+++ b/src/wx/xrc/JoyPanel.xrc
@@ -24,6 +24,14 @@
wxALL|wxEXPAND
5
+