From b5baacec2c4911f27daacd1e3e1838cbbc3a8ef7 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Sun, 28 Oct 2012 07:20:12 -0700 Subject: [PATCH] Fix merge error in df60c2e7a4d7cb27170b1926aaa358e17e79724b Although wxSTC defines SetValue, it doesn't actually work correctly. --- aegisub/src/subs_edit_box.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aegisub/src/subs_edit_box.cpp b/aegisub/src/subs_edit_box.cpp index 17a5530cc..96e110c4d 100644 --- a/aegisub/src/subs_edit_box.cpp +++ b/aegisub/src/subs_edit_box.cpp @@ -290,7 +290,7 @@ void SubsEditBox::OnCommit(int type) { } if (type & AssFile::COMMIT_DIAG_TEXT) { - TextEdit->SetValue(line->Text); + TextEdit->SetTextTo(line->Text); } if (type & AssFile::COMMIT_DIAG_META) { @@ -495,7 +495,7 @@ void SubsEditBox::SetControlsState(bool state) { Enable(state); if (!state) { wxEventBlocker blocker(this); - TextEdit->SetValue(""); + TextEdit->SetTextTo(""); } }