diff options
| author | John Peterson <jpeterson57@gmail.com> | 2009-02-08 14:34:23 +0000 |
|---|---|---|
| committer | John Peterson <jpeterson57@gmail.com> | 2009-02-08 14:34:23 +0000 |
| commit | c6b4f5c8191ca52c6f366e1e07baec557d032504 (patch) | |
| tree | 61acc9d2d3964af6beb4fcfe24c29e6a13eef1dd /Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp | |
| parent | 44370518a37d2c28811d5ad5fb76df060a6ff482 (diff) | |
InputCommon and nJoy: Moved functions to InputCommon, to be shared with the Wiimote plugin
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2147 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp')
| -rw-r--r-- | Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp b/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp index b1a2d48e53..2590546990 100644 --- a/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp +++ b/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp @@ -475,7 +475,7 @@ void ConfigBox::UpdateGUI(int _notebookpage) UpdateGUIKeys(_notebookpage); // Collect status - bool Hat = (PadMapping[_notebookpage].controllertype == CTL_DPAD_HAT); + bool Hat = (PadMapping[_notebookpage].controllertype == InputCommon::CTL_DPAD_HAT); long Left, Right; m_JoyShoulderL[_notebookpage]->GetValue().ToLong(&Left); m_JoyShoulderR[_notebookpage]->GetValue().ToLong(&Right); @@ -619,12 +619,12 @@ void ConfigBox::CreateGUIControls() // Populate the DPad type and Trigger type list // ----------------------------- wxArrayString wxAS_DPadType; - wxAS_DPadType.Add(wxString::FromAscii(DPadType[CTL_DPAD_HAT])); - wxAS_DPadType.Add(wxString::FromAscii(DPadType[CTL_DPAD_CUSTOM])); + wxAS_DPadType.Add(wxString::FromAscii(DPadType[InputCommon::CTL_DPAD_HAT])); + wxAS_DPadType.Add(wxString::FromAscii(DPadType[InputCommon::CTL_DPAD_CUSTOM])); wxArrayString wxAS_TriggerType; - wxAS_TriggerType.Add(wxString::FromAscii(TriggerType[CTL_TRIGGER_SDL])); - wxAS_TriggerType.Add(wxString::FromAscii(TriggerType[CTL_TRIGGER_XINPUT])); + wxAS_TriggerType.Add(wxString::FromAscii(TriggerType[InputCommon::CTL_TRIGGER_SDL])); + wxAS_TriggerType.Add(wxString::FromAscii(TriggerType[InputCommon::CTL_TRIGGER_XINPUT])); // -------------------------------------------------------------------- // Populate the deadzone list |