mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 04:08:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Windows/Linux/whatever build fix.

Browse source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5762 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
XTra.KrazzY 2010-06-21 18:25:49 +00:00
commit 1b5b57bff3
3 changed files with 57 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Source/Core/InputUICommon/Src/ConfigDiag.cpp
View file

@ -192,10 +192,8 @@ void ControlDialog::UpdateListContents()
{
control_lbox->Clear();
const std::vector<ControllerInterface::Device*>::const_iterator di =
std::find(m_plugin.controller_interface.Devices().begin(),
m_plugin.controller_interface.Devices().end(),
m_devq);
std::vector<ControllerInterface::Device*>::const_iterator di =
FindDevice(m_plugin.controller_interface.Devices(), m_devq);
if (m_plugin.controller_interface.Devices().end() != di)
{
@ -413,9 +411,8 @@ void ControlDialog::DetectControl(wxCommandEvent& event)
wxButton* const btn = (wxButton*)event.GetEventObject();
const wxString lbl = btn->GetLabel();
const std::vector<ControllerInterface::Device*>::const_iterator di =
std::find(m_plugin.controller_interface.Devices().begin(),
m_plugin.controller_interface.Devices().end(), m_devq);
std::vector<ControllerInterface::Device*>::const_iterator di =
FindDevice(m_plugin.controller_interface.Devices(), m_devq);
if (m_plugin.controller_interface.Devices().end() != di)
{
@ -440,8 +437,7 @@ void GamepadPage::DetectControl( wxCommandEvent& event )
// find device :/
const std::vector<ControllerInterface::Device*>::const_iterator di =
std::find(m_plugin.controller_interface.Devices().begin(),
m_plugin.controller_interface.Devices().end(), controller->default_device);
FindDevice(m_plugin.controller_interface.Devices(), controller->default_device);
if (m_plugin.controller_interface.Devices().end() != di)
{