mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Fix merge error in df60c2e7a4

Browse source 
Although wxSTC defines SetValue, it doesn't actually work correctly.
This commit is contained in:
Thomas Goyne 2012-10-28 07:20:12 -07:00
parent 0e7501f45c
commit b5baacec2c
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
aegisub/src/subs_edit_box.cpp
View file

@ -290,7 +290,7 @@ void SubsEditBox::OnCommit(int type) {
} }
if (type & AssFile::COMMIT_DIAG_TEXT) { if (type & AssFile::COMMIT_DIAG_TEXT) {
TextEdit->SetValue(line->Text); TextEdit->SetTextTo(line->Text);
} }
if (type & AssFile::COMMIT_DIAG_META) { if (type & AssFile::COMMIT_DIAG_META) {
@ -495,7 +495,7 @@ void SubsEditBox::SetControlsState(bool state) {
Enable(state); Enable(state);
if (!state) { if (!state) {
wxEventBlocker blocker(this); wxEventBlocker blocker(this);
TextEdit->SetValue(""); TextEdit->SetTextTo("");
} }
} }