mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-22 22:00:39 -06:00
Wiimote and nJoy > Gamepad changes
1. Added LiveUpdates, while the configuration window is open nJoy and Wiimote will check for connected/disconnected pads 2. Removed the 'Nintendo RVL-CNT-01' device from the device list, and other SDL devices with no axes/buttons 3. Added SDL (from the current SVN) to get debugging information for SDL.dll 4. Added 'Upright Wiimote' option to emulated Wiimote options git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4534 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
@ -62,12 +62,17 @@ class PADConfigDialognJoy : public wxDialog
|
||||
long style = wxDEFAULT_DIALOG_STYLE);
|
||||
virtual ~PADConfigDialognJoy();
|
||||
|
||||
// Timers
|
||||
#if wxUSE_TIMER
|
||||
void OnSlowTimer(wxTimerEvent& WXUNUSED(event)) { UpdateSlow(); }
|
||||
void OnTimer(wxTimerEvent& WXUNUSED(event)) { Update(); }
|
||||
void OnButtonTimer(wxTimerEvent& WXUNUSED(event)) { DoGetButtons(GetButtonWaitingID); }
|
||||
wxTimer *m_ConstantTimer, *m_ButtonMappingTimer;
|
||||
wxTimer *m_SlowTimer, *m_ConstantTimer, *m_ButtonMappingTimer;
|
||||
#endif
|
||||
|
||||
// Functions
|
||||
void DoShow();
|
||||
|
||||
// Debugging
|
||||
wxStaticText* m_pStatusBar, * m_pStatusBar2;
|
||||
wxTextCtrl* m_TCDebugging;
|
||||
@ -195,7 +200,10 @@ class PADConfigDialognJoy : public wxDialog
|
||||
*m_bmpSquare[4], *m_bmpDot[4], *m_bmpSquareOut[4], *m_bmpDotOut[4], *m_bmpAreaOut[4],
|
||||
*m_bmpSquareC[4], *m_bmpDotC[4], *m_bmpSquareOutC[4], *m_bmpDotOutC[4], *m_bmpAreaOutC[4];
|
||||
|
||||
int notebookpage; bool ControlsCreated;
|
||||
// Settings
|
||||
int notebookpage;
|
||||
bool ControlsCreated;
|
||||
bool LiveUpdates;
|
||||
|
||||
private:
|
||||
enum
|
||||
@ -233,7 +241,7 @@ class PADConfigDialognJoy : public wxDialog
|
||||
IDT_TRIGGERS, IDCB_CHECKFOCUS, IDCB_FILTER_SETTINGS,
|
||||
|
||||
// Timers
|
||||
IDTM_CONSTANT, IDTM_BUTTON,
|
||||
IDTM_SLOW, IDTM_CONSTANT, IDTM_BUTTON,
|
||||
|
||||
|
||||
// ==============================================
|
||||
@ -316,6 +324,8 @@ class PADConfigDialognJoy : public wxDialog
|
||||
void OKClick(wxCommandEvent& event);
|
||||
void CancelClick(wxCommandEvent& event);
|
||||
void DoSave(bool ChangePad = false, int Slot = -1);
|
||||
void UpdateID();
|
||||
void StartTimer();
|
||||
|
||||
void DoChangeJoystick();
|
||||
|
||||
@ -323,20 +333,22 @@ class PADConfigDialognJoy : public wxDialog
|
||||
|
||||
void ChangeSettings(wxCommandEvent& event);
|
||||
void ComboChange(wxCommandEvent& event);
|
||||
|
||||
|
||||
void OnClose(wxCloseEvent& event);
|
||||
void UpdateDeviceList();
|
||||
void CreateGUIControls();
|
||||
void CreateAdvancedControls(int i);
|
||||
wxBitmap CreateBitmap();
|
||||
wxBitmap CreateBitmapDot();
|
||||
wxBitmap CreateBitmapArea(int,int);
|
||||
void PadGetStatus();
|
||||
void PadShowStatus();
|
||||
void UpdateSlow();
|
||||
void Update();
|
||||
|
||||
void UpdateGUIButtonMapping(int controller);
|
||||
void SaveButtonMapping(int controller, bool DontChangeId = false, int FromSlot = -1);
|
||||
void SaveButtonMappingAll(int Slot);
|
||||
void UpdateGUIAll(int Slot);
|
||||
void UpdateGUIAll(int Slot = -1);
|
||||
void ToBlank(bool ToBlank = true);
|
||||
void OnSaveById();
|
||||
|
||||
|
Reference in New Issue
Block a user