diff options
Diffstat (limited to 'src/wx/InputConfig.h')
-rw-r--r-- | src/wx/InputConfig.h | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/wx/InputConfig.h b/src/wx/InputConfig.h index c1bc64b..35d1e3f 100644 --- a/src/wx/InputConfig.h +++ b/src/wx/InputConfig.h @@ -37,19 +37,28 @@ private: void OnDerp(wxCommandEvent& event); - void OnConfigureKey(wxCommandEvent& event); - void OnConfigureJoy(wxCommandEvent& event); + void OnConfigureKey(wxMouseEvent& event); + void OnConfigureJoy(wxMouseEvent& event); void OnPoll(wxTimerEvent& event); void OnKeyDown(wxKeyEvent& event); + void OnFancybuttonHover(wxMouseEvent& event); + + void JoyMappingName(int id, char* str); + + SDL_Window* sdlwin; + wxPanel* keycatcher; const u8* keystate; int nkeys; + int njoys; + SDL_Joystick* joy; wxTimer* polltimer; int pollid; - wxButton* pollbtn; + wxStaticText* pollbtn; + wxString pollbtntext; int keymapping[12]; int joymapping[12]; |