some more work on pad/event handler

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1733 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee
2009-01-02 14:10:52 +00:00
parent dbd9d5fb2d
commit a2a5d0a066
5 changed files with 97 additions and 38 deletions

View File

@ -195,12 +195,13 @@ void ConfigDialog::OnKeyDown(wxKeyEvent& event)
if(clickedButton != NULL) {
int page = m_Notebook->GetSelection();
int sfcode = EventHandler::wxCharCodeWXToSF(event.GetKeyCode());
sf::Key::Code sfcode = EventHandler::wxCharCodeToSF(event.GetKeyCode());
char sfstr[100];
EventHandler::SFKeyToString(sfcode, sfstr);
pad[page].keyForControl[clickedButton->GetId()] = sfcode;
clickedButton->SetLabel(wxString::FromAscii(sfstr));
// pad[page].keyForControl[clickedButton->GetId()] = sfcode;
if (registerKey(page, clickedButton->GetId(), sfcode))
clickedButton->SetLabel(wxString::FromAscii(sfstr));
clickedButton->Disconnect();
}