Skip to content

Commit

Permalink
Change the textctrl->SetLabel's to textctrl->SetValue's in stable too.
Browse files Browse the repository at this point in the history
git-svn-id: https://dolphin-emu.googlecode.com/svn/branches/stable@5369 8ced0084-cf51-0410-be5f-012b33b47a6e
  • Loading branch information
glennricster committed Apr 14, 2010
1 parent 909f360 commit 1b7065d
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Source/Plugins/Plugin_GCPadNew/Src/ConfigDiag.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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();

Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 1b7065d

Please sign in to comment.