diff options
| author | John Peterson <jpeterson57@gmail.com> | 2009-11-12 21:20:16 +0000 |
|---|---|---|
| committer | John Peterson <jpeterson57@gmail.com> | 2009-11-12 21:20:16 +0000 |
| commit | 926ff36489f1cfda30ac537add4d0805ff488986 (patch) | |
| tree | ced81d14e5154085b68068b2f4b6714ee34722b3 /Source | |
| parent | 18450737beab7c9cd826ea7cc5380e2f48b0eae7 (diff) | |
Build (minor) > Fixed linux compilation errors
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4544 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Plugins/Plugin_Wiimote/Src/EmuPad.cpp | 8 | ||||
| -rw-r--r-- | Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Source/Plugins/Plugin_Wiimote/Src/EmuPad.cpp b/Source/Plugins/Plugin_Wiimote/Src/EmuPad.cpp index 302589d440..bcfce2401d 100644 --- a/Source/Plugins/Plugin_Wiimote/Src/EmuPad.cpp +++ b/Source/Plugins/Plugin_Wiimote/Src/EmuPad.cpp @@ -50,11 +50,11 @@ namespace WiiMoteEmu bool LocalSearchDevices(std::vector<InputCommon::CONTROLLER_INFO> &_joyinfo, int &_NumPads) { //DEBUG_LOG(PAD, "LocalSearchDevices"); - bool Success = InputCommon::SearchDevices(_joyinfo, _NumPads); + bool bSuccess = InputCommon::SearchDevices(_joyinfo, _NumPads); DoLocalSearchDevices(_joyinfo, _NumPads); - return Success; + return bSuccess; } bool LocalSearchDevicesReset(std::vector<InputCommon::CONTROLLER_INFO> &_joyinfo, int &_NumPads) @@ -64,13 +64,13 @@ bool LocalSearchDevicesReset(std::vector<InputCommon::CONTROLLER_INFO> &_joyinfo // Turn off device polling while resetting EnablePolling(false); - bool Success = InputCommon::SearchDevicesReset(_joyinfo, _NumPads); + bool bSuccess = InputCommon::SearchDevicesReset(_joyinfo, _NumPads); EnablePolling(true); DoLocalSearchDevices(_joyinfo, _NumPads); - return Success; + return bSuccess; } // Fill joyinfo with the current connected devices diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp b/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp index 357c583ea9..538181d0f7 100644 --- a/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp +++ b/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp @@ -807,7 +807,7 @@ void PADConfigDialognJoy::CreateGUIControls() #ifdef _WIN32 m_Joyname[i] = new wxComboBox(m_Controller[i], IDC_JOYNAME, wxEmptyString, wxDefaultPosition, wxSize(476, 21), 0, NULL, wxCB_READONLY); #else - m_Joyname[i] = new wxComboBox(m_Controller[i], IDC_JOYNAME, arrayStringFor_Joyname[0], wxDefaultPosition, wxSize(450, 25), arrayStringFor_Joyname, 0, wxDefaultValidator, wxT("m_Joyname")); + m_Joyname[i] = new wxComboBox(m_Controller[i], IDC_JOYNAME, wxEmptyString, wxDefaultPosition, wxSize(450, 25), 0, NULL, wxCB_READONLY); #endif m_gJoyname[i] = new wxStaticBoxSizer (wxHORIZONTAL, m_Controller[i], wxT("Controller")); |