summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2015-08-21 02:07:04 -0400
committerLioncash <mathew1800@gmail.com>2015-08-21 02:07:04 -0400
commit4bdade0ea69ca613549f687acd4e4a294df52d04 (patch)
treed4c1ddc9bb685b5c1b0fa081ec107d1a4b42fbc0 /Source
parentf481a306c2708f16bdc5b97e4ddbbe23dc318f38 (diff)
parent65ee5a1d361245a34c5c4a11a6341080e6c40900 (diff)
Merge pull request #2885 from endrift/tasinputdlg-threading
DolphinWX: Finish removing bandaid from 704f787
Diffstat (limited to 'Source')
-rw-r--r--Source/Core/DolphinWX/TASInputDlg.cpp13
1 files changed, 2 insertions, 11 deletions
diff --git a/Source/Core/DolphinWX/TASInputDlg.cpp b/Source/Core/DolphinWX/TASInputDlg.cpp
index 042aa2673c..20df71ecf2 100644
--- a/Source/Core/DolphinWX/TASInputDlg.cpp
+++ b/Source/Core/DolphinWX/TASInputDlg.cpp
@@ -208,7 +208,6 @@ void TASInputDlg::FinishLayout()
Bind(wxEVT_CLOSE_WINDOW, &TASInputDlg::OnCloseWindow, this);
Bind(GCPAD_UPDATE_CALLBACK, &TASInputDlg::GetValuesCallback, this);
Bind(WIIMOTE_UPDATE_CALLBACK, &TASInputDlg::GetValuesCallback, this);
- Bind(wxEVT_TEXT, &TASInputDlg::UpdateFromText, this);
m_has_layout = true;
}
@@ -508,22 +507,14 @@ void TASInputDlg::SetSliderValue(Control* control, int CurrentValue)
{
control->value = CurrentValue;
control->set_by_keyboard = true;
- control->text->ChangeValue(std::to_string(CurrentValue));
+ control->text->SetValue(std::to_string(CurrentValue));
}
else if (control->set_by_keyboard)
{
control->value = control->default_value;
control->set_by_keyboard = false;
- control->text->ChangeValue(std::to_string(control->default_value));
+ control->text->SetValue(std::to_string(control->default_value));
}
- else
- {
- return;
- }
-
- wxCommandEvent* evt = new wxCommandEvent(wxEVT_TEXT, control->text_id);
- evt->SetEventObject(control->text);
- wxQueueEvent(this, evt);
}
void TASInputDlg::SetButtonValue(Button* button, bool CurrentState)