From 1b7065d8b42426546e57a0b37503f88e85a55598 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Wed, 14 Apr 2010 23:39:36 +0000 Subject: [PATCH] Change the textctrl->SetLabel's to textctrl->SetValue's in stable too. git-svn-id: https://dolphin-emu.googlecode.com/svn/branches/stable@5369 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Plugins/Plugin_GCPadNew/Src/ConfigDiag.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Plugins/Plugin_GCPadNew/Src/ConfigDiag.cpp b/Source/Plugins/Plugin_GCPadNew/Src/ConfigDiag.cpp index cdbce1a806cd..0b4cdce1dc62 100644 --- a/Source/Plugins/Plugin_GCPadNew/Src/ConfigDiag.cpp +++ b/Source/Plugins/Plugin_GCPadNew/Src/ConfigDiag.cpp @@ -180,7 +180,7 @@ void ControlChooser::UpdateGUI() if ( bound ) ss << bound; else ss << "None"; 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() @@ -229,7 +229,7 @@ void GamepadPage::SetControl( wxCommandEvent& event ) { 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_chooser->UpdateGUI(); @@ -372,7 +372,7 @@ void ControlDialog::SelectControl( wxCommandEvent& event ) #ifdef __linux__ if (!((wxWindow*)this)->IsBeingDeleted()) #endif - control_chooser->textctrl->SetLabel( final_label ); + control_chooser->textctrl->SetValue( final_label ); #ifndef __linux__ // This causes the application to hang in linux // kinda dumb