ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Build (minor) > Fixed linux compilation errors 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4544 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
John Peterson 2009-11-12 21:20:16 +00:00
parent 18450737be
commit 926ff36489
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Plugins/Plugin_Wiimote/Src/EmuPad.cpp
View File

@ -50,11 +50,11 @@ namespace WiiMoteEmu
bool LocalSearchDevices(std::vector<InputCommon::CONTROLLER_INFO> &_joyinfo, int &_NumPads) bool LocalSearchDevices(std::vector<InputCommon::CONTROLLER_INFO> &_joyinfo, int &_NumPads)
{ {
//DEBUG_LOG(PAD, "LocalSearchDevices"); //DEBUG_LOG(PAD, "LocalSearchDevices");
bool Success = InputCommon::SearchDevices(_joyinfo, _NumPads); bool bSuccess = InputCommon::SearchDevices(_joyinfo, _NumPads);
DoLocalSearchDevices(_joyinfo, _NumPads); DoLocalSearchDevices(_joyinfo, _NumPads);
return Success; return bSuccess;
} }
bool LocalSearchDevicesReset(std::vector<InputCommon::CONTROLLER_INFO> &_joyinfo, int &_NumPads) 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 // Turn off device polling while resetting
EnablePolling(false); EnablePolling(false);
bool Success = InputCommon::SearchDevicesReset(_joyinfo, _NumPads); bool bSuccess = InputCommon::SearchDevicesReset(_joyinfo, _NumPads);
EnablePolling(true); EnablePolling(true);
DoLocalSearchDevices(_joyinfo, _NumPads); DoLocalSearchDevices(_joyinfo, _NumPads);
return Success; return bSuccess;
} }
// Fill joyinfo with the current connected devices // Fill joyinfo with the current connected devices

2
Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp
View File

@ -807,7 +807,7 @@ void PADConfigDialognJoy::CreateGUIControls()
#ifdef _WIN32 #ifdef _WIN32
m_Joyname[i] = new wxComboBox(m_Controller[i], IDC_JOYNAME, wxEmptyString, wxDefaultPosition, wxSize(476, 21), 0, NULL, wxCB_READONLY); m_Joyname[i] = new wxComboBox(m_Controller[i], IDC_JOYNAME, wxEmptyString, wxDefaultPosition, wxSize(476, 21), 0, NULL, wxCB_READONLY);
#else #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 #endif
m_gJoyname[i] = new wxStaticBoxSizer (wxHORIZONTAL, m_Controller[i], wxT("Controller")); m_gJoyname[i] = new wxStaticBoxSizer (wxHORIZONTAL, m_Controller[i], wxT("Controller"));