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

Fix pad working in OSX 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5259 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Sonicadvance1 2010-04-01 03:34:49 +00:00
parent d2cee0a869
commit 4e1719e98b
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Plugins/Plugin_GCPadNew/Src/ConfigDiag.cpp
View File

@ -212,13 +212,12 @@ void GamepadPage::SetDevice( wxCommandEvent& event )
{ {
m_plugin.controls_crit.Enter(); // enter m_plugin.controls_crit.Enter(); // enter
// TODO: need to handle the ConfigControl device in here // TODO: need to handle the ConfigControl device in here
// default device // default device
if ( event.GetEventObject() == device_cbox ) if ( event.GetEventObject() == device_cbox )
{ {
controller->default_device.FromString( std::string( device_cbox->GetLabel().ToAscii() ) ); controller->default_device.FromString( std::string( device_cbox->GetValue().ToAscii() ) );
// show user what it was validated as // show user what it was validated as
device_cbox->SetLabel( wxString::FromAscii( controller->default_device.ToString().c_str() ) ); device_cbox->SetLabel( wxString::FromAscii( controller->default_device.ToString().c_str() ) );
@ -232,7 +231,7 @@ void GamepadPage::SetDevice( wxCommandEvent& event )
// control dialog // control dialog
else else
{ {
m_control_dialog->control_reference->device_qualifier.FromString( std::string( m_control_dialog->device_cbox->GetLabel().ToAscii() ) ); m_control_dialog->control_reference->device_qualifier.FromString( std::string( m_control_dialog->device_cbox->GetValue().ToAscii() ) );
m_control_dialog->device_cbox->SetLabel( wxString::FromAscii( m_control_dialog->control_reference->device_qualifier.ToString().c_str() ) ); m_control_dialog->device_cbox->SetLabel( wxString::FromAscii( m_control_dialog->control_reference->device_qualifier.ToString().c_str() ) );