Skip to content
Permalink
Browse files

minor fix for stl wx builds

`XRCID()` expects a `const char *` not a `wxString`.

Signed-off-by: Rafael Kitover <rkitover@gmail.com>
  • Loading branch information
rkitover committed Aug 16, 2019
1 parent 51a4f74 commit dc8d36a08c3242a9ed3d861b30e28b89418bc7df
Showing with 2 additions and 2 deletions.
  1. +2 −2 src/wx/guiinit.cpp
@@ -1652,7 +1652,7 @@ static class JoyPadConfig_t : public wxEvtHandler {
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)) {
if (ev.GetId() == XRCID(singleClearButton.c_str())) {
tc->SetValue(wxEmptyString);
return;
}
@@ -3738,7 +3738,7 @@ bool MainFrame::BindControls()
wxCommandEventHandler(JoyPadConfig_t::JoypadConfigButtons),
NULL, &JoyPadConfigHandler[i]);
for (int j = 0; j < NUM_KEYS; ++j) {
w->Connect(XRCID(wxString("Clear" + joynames[j])),
w->Connect(XRCID(wxString("Clear" + joynames[j]).c_str()),
wxEVT_COMMAND_BUTTON_CLICKED,
wxCommandEventHandler(JoyPadConfig_t::JoypadConfigButtons),
NULL, &JoyPadConfigHandler[i]);

0 comments on commit dc8d36a

Please sign in to comment.
You can’t perform that action at this time.