piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 09:09:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Change the textctrl->SetLabel's to textctrl->SetValue's in stable too.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/branches/stable@5369 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice
2010-04-14 23:39:36 +00:00
parent 909f36017b
commit 1b7065d8b4
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -180,7 +180,7 @@ void ControlChooser::UpdateGUI()
if ( bound ) ss << bound; else ss << "None"; if ( bound ) ss << bound; else ss << "None";
m_bound_label->SetLabel( wxString::FromAscii(ss.str().c_str()) ); m_bound_label->SetLabel( wxString::FromAscii(ss.str().c_str()) );
textctrl->SetLabel( wxString::FromAscii( control_reference->control_qualifier.name.c_str() ) ); textctrl->SetValue( wxString::FromAscii( control_reference->control_qualifier.name.c_str() ) );
}; };
void GamepadPage::UpdateGUI() void GamepadPage::UpdateGUI()
@ -229,7 +229,7 @@ void GamepadPage::SetControl( wxCommandEvent& event )
{ {
m_plugin.controls_crit.Enter(); // enter m_plugin.controls_crit.Enter(); // enter
m_control_dialog->control_reference->control_qualifier.name = std::string( m_control_dialog->control_chooser->textctrl->GetLabel().ToAscii() ); m_control_dialog->control_reference->control_qualifier.name = std::string( m_control_dialog->control_chooser->textctrl->GetValue().ToAscii() );
m_control_dialog->control_reference->UpdateControls(); m_control_dialog->control_reference->UpdateControls();
m_control_dialog->control_chooser->UpdateGUI(); m_control_dialog->control_chooser->UpdateGUI();
@ -372,7 +372,7 @@ void ControlDialog::SelectControl( wxCommandEvent& event )
#ifdef __linux__ #ifdef __linux__
if (!((wxWindow*)this)->IsBeingDeleted()) if (!((wxWindow*)this)->IsBeingDeleted())
#endif #endif
control_chooser->textctrl->SetLabel( final_label ); control_chooser->textctrl->SetValue( final_label );
#ifndef __linux__ // This causes the application to hang in linux #ifndef __linux__ // This causes the application to hang in linux
// kinda dumb // kinda dumb