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

Fixed linux build 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4744 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
XTra.KrazzY 2009-12-29 12:13:47 +00:00
parent c9edf3cde0
commit bd5d4cd34e
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Plugins/Plugin_Wiimote/Src/ConfigPadDlg.cpp
View File

@ -216,8 +216,9 @@ void WiimotePadConfigDialog::OnKeyDown(wxKeyEvent& event)
#elif defined(HAVE_X11) && HAVE_X11 #elif defined(HAVE_X11) && HAVE_X11
int XKey = InputCommon::wxCharCodeWXToX(g_Pressed); int XKey = InputCommon::wxCharCodeWXToX(g_Pressed);
InputCommon::XKeyToString(XKey, keyStr); InputCommon::XKeyToString(XKey, keyStr);
SetButtonText(ClickedButton->GetId(), keyStr); SetButtonText(ClickedButton->GetId(),
SaveKeyboardMapping(m_Page, ClickedButton->GetId(), XKey); wxString::FromAscii(keyStr));
SaveButtonMapping(ClickedButton->GetId(), XKey);
#endif #endif
} }
m_ButtonMappingTimer->Stop(); m_ButtonMappingTimer->Stop();
@ -1103,7 +1104,7 @@ void WiimotePadConfigDialog::UpdateGUI()
for (int x = 0; x <= IDB_GH3_STRUM_DOWN - IDB_GH3_GREEN; x++) for (int x = 0; x <= IDB_GH3_STRUM_DOWN - IDB_GH3_GREEN; x++)
{ {
InputCommon::XKeyToString(WiiMoteEmu::WiiMapping[m_Page].Button[x + WiiMoteEmu::EGH_Green], keyStr); InputCommon::XKeyToString(WiiMoteEmu::WiiMapping[m_Page].Button[x + WiiMoteEmu::EGH_Green], keyStr);
m_Button_GH3[x][slot]->SetLabel(wxString::FromAscii(keyStr)); m_Button_GH3[x][m_Page]->SetLabel(wxString::FromAscii(keyStr));
} }
} }
#endif #endif