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

Fix for non-stl wx builds. 

Followup on baa0341b.

Use ToStdWstring() instead of wc_str() to look up strings in the map,
the key for the map is std::wstring.

Signed-off-by: Rafael Kitover <rkitover@gmail.com>
This commit is contained in:
Rafael Kitover 2020-06-23 02:02:16 +00:00
parent 047cc29787
commit f51e1ee4ec
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/wx/wxutil.cpp
View File

@ -77,16 +77,16 @@ KeyboardInputMap::KeyboardInputMap(){}
void KeyboardInputMap::AddMap(wxString keyStr, int key, int mod) void KeyboardInputMap::AddMap(wxString keyStr, int key, int mod)
{ {
KeyboardInputMap* singleton = getInstance(); KeyboardInputMap* singleton = getInstance();
singleton->keysMap[keyStr.wc_str()] = singleton->newPair(key, mod); singleton->keysMap[keyStr.ToStdWstring()] = singleton->newPair(key, mod);
} }
bool KeyboardInputMap::GetMap(wxString keyStr, int &key, int &mod) bool KeyboardInputMap::GetMap(wxString keyStr, int &key, int &mod)
{ {
KeyboardInputMap* singleton = getInstance(); KeyboardInputMap* singleton = getInstance();
if (contains(singleton->keysMap, keyStr.wc_str())) { if (contains(singleton->keysMap, keyStr.ToStdWstring())) {
key = singleton->keysMap.at(keyStr.wc_str()).key; key = singleton->keysMap.at(keyStr.ToStdWstring()).key;
mod = singleton->keysMap.at(keyStr.wc_str()).mod; mod = singleton->keysMap.at(keyStr.ToStdWstring()).mod;
return true; return true;
} }
return false; return false;