ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

minor fix for stl wx builds 

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

Signed-off-by: Rafael Kitover <rkitover@gmail.com>
This commit is contained in:
Rafael Kitover 2019-08-16 06:08:47 +00:00
parent 51a4f74b94
commit dc8d36a08c
No known key found for this signature in database
GPG Key ID: 08AB596679D86240
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wx/guiinit.cpp
View File

@ -1652,7 +1652,7 @@ public:
for (int i = 0; i < NUM_KEYS; ++i) { for (int i = 0; i < NUM_KEYS; ++i) {
wxJoyKeyTextCtrl* tc = XRCCTRL_D(*p, joynames[i], wxJoyKeyTextCtrl); wxJoyKeyTextCtrl* tc = XRCCTRL_D(*p, joynames[i], wxJoyKeyTextCtrl);
wxString singleClearButton("Clear" + joynames[i]); wxString singleClearButton("Clear" + joynames[i]);
if (ev.GetId() == XRCID(singleClearButton)) { if (ev.GetId() == XRCID(singleClearButton.c_str())) {
tc->SetValue(wxEmptyString); tc->SetValue(wxEmptyString);
return; return;
} }
@ -3738,7 +3738,7 @@ bool MainFrame::BindControls()
wxCommandEventHandler(JoyPadConfig_t::JoypadConfigButtons), wxCommandEventHandler(JoyPadConfig_t::JoypadConfigButtons),
NULL, &JoyPadConfigHandler[i]); NULL, &JoyPadConfigHandler[i]);
for (int j = 0; j < NUM_KEYS; ++j) { 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, wxEVT_COMMAND_BUTTON_CLICKED,
wxCommandEventHandler(JoyPadConfig_t::JoypadConfigButtons), wxCommandEventHandler(JoyPadConfig_t::JoypadConfigButtons),
NULL, &JoyPadConfigHandler[i]); NULL, &JoyPadConfigHandler[i]);