cocoa event wip, i'm tired i'll continue tomorrow

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1860 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
tmator
2009-01-13 00:34:36 +00:00
parent 4fd0f3035a
commit 2d586139bc
6 changed files with 83 additions and 6 deletions

View File

@ -84,7 +84,7 @@ inline void AddControl(wxPanel *pan, wxButton **button, wxStaticBoxSizer *sizer,
wxALIGN_CENTER_VERTICAL|wxALL);
#ifdef _WIN32
DInput::DIKToString(pad[controller].keyForControl[ctl], keyStr);
#else
#elif defined(HAVE_X11) && HAVE_X11
XKeyToString(pad[controller].keyForControl[ctl], keyStr);
#endif
@ -269,7 +269,7 @@ void ConfigDialog::OnKeyDown(wxKeyEvent& event)
break;
}
}
#else
#elif defined(HAVE_X11) && HAVE_X11
pad[page].keyForControl[clickedButton->GetId()] = wxCharCodeWXToX(event.GetKeyCode());
clickedButton->SetLabel(wxString::Format(_T("%c"), event.GetKeyCode()));
#endif