From bd5d4cd34e0520a7570f66aaad7df512c540ff8e Mon Sep 17 00:00:00 2001 From: "XTra.KrazzY" Date: Tue, 29 Dec 2009 12:13:47 +0000 Subject: [PATCH] Fixed linux build git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4744 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Plugins/Plugin_Wiimote/Src/ConfigPadDlg.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Source/Plugins/Plugin_Wiimote/Src/ConfigPadDlg.cpp b/Source/Plugins/Plugin_Wiimote/Src/ConfigPadDlg.cpp index edb2010726..2d4b144472 100644 --- a/Source/Plugins/Plugin_Wiimote/Src/ConfigPadDlg.cpp +++ b/Source/Plugins/Plugin_Wiimote/Src/ConfigPadDlg.cpp @@ -216,8 +216,9 @@ void WiimotePadConfigDialog::OnKeyDown(wxKeyEvent& event) #elif defined(HAVE_X11) && HAVE_X11 int XKey = InputCommon::wxCharCodeWXToX(g_Pressed); InputCommon::XKeyToString(XKey, keyStr); - SetButtonText(ClickedButton->GetId(), keyStr); - SaveKeyboardMapping(m_Page, ClickedButton->GetId(), XKey); + SetButtonText(ClickedButton->GetId(), + wxString::FromAscii(keyStr)); + SaveButtonMapping(ClickedButton->GetId(), XKey); #endif } m_ButtonMappingTimer->Stop(); @@ -1103,7 +1104,7 @@ void WiimotePadConfigDialog::UpdateGUI() 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); - m_Button_GH3[x][slot]->SetLabel(wxString::FromAscii(keyStr)); + m_Button_GH3[x][m_Page]->SetLabel(wxString::FromAscii(keyStr)); } } #endif