piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 21:30:19 -06:00
Code Issues Packages Projects Releases Wiki Activity

nJoy: Fixed the analog trigger buttons

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1934 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
John Peterson
2009-01-19 17:47:00 +00:00
parent be1e403435
commit 8f40075f8f
13 changed files with 478 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.h
View File

@ -63,7 +63,8 @@ class ConfigBox : public wxDialog
#if wxUSE_TIMER
void OnTimer(wxTimerEvent& WXUNUSED(event)) { Update(); }
wxTimer m_timer;
void OnButtonTimer(wxTimerEvent& WXUNUSED(event)) { DoGetButtons(GetButtonWaitingID); }
wxTimer *m_ConstantTimer, *m_ButtonMappingTimer;
#endif
// Debugging
@ -71,6 +72,9 @@ class ConfigBox : public wxDialog
// Status window
int BoxW, BoxH;
// Configure buttons
int GetButtonWaitingID, GetButtonWaitingTimer;
private:
wxButton *m_About;
@ -86,7 +90,6 @@ class ConfigBox : public wxDialog
wxStaticBoxSizer * m_sKeys[4];
wxBoxSizer *m_sMain[4], *m_sMainLeft[4], *m_sMainRight[4];
/////////////////////////////
// Settings
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
@ -208,6 +211,9 @@ class ConfigBox : public wxDialog
// Advaced settings
IDCB_MAINSTICK_DIAGONAL, IDCB_MAINSTICK_S_TO_C, IDT_MAINSTICK_DIAGONAL,
// Timers
IDTM_CONSTANT, IDTM_BUTTON,
// --------------------------------------------------------------------
// Keys objects
@ -292,12 +298,12 @@ class ConfigBox : public wxDialog
wxBitmap CreateBitmap(); wxBitmap CreateBitmapDot();
void PadGetStatus(); void Update();
void SetControllerAll(int controller);
void GetControllerAll(int controller);
void UpdateGUIKeys(int controller);
void SaveButtonMapping(int controller);
void NotebookPageChanged(wxNotebookEvent& event);
void GetButtons(wxCommandEvent& event);
void GetButtons(wxCommandEvent& event); void DoGetButtons(int);
void GetHats(int ID);
void GetAxis(wxCommandEvent& event);