From 62f37772a3d8298c2bf32fc0c4f363471d87840c Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Wed, 19 Oct 2011 04:05:09 +0000
Subject: [PATCH] Fix a pile of issues that resulted in the Actor box not
 working at all

Originally committed to SVN as r5758.
---
 aegisub/src/subs_edit_box.cpp | 72 ++++++++++++++++++++---------------
 aegisub/src/subs_edit_box.h   |  3 ++
 2 files changed, 45 insertions(+), 30 deletions(-)

diff --git a/aegisub/src/subs_edit_box.cpp b/aegisub/src/subs_edit_box.cpp
index d436e036f..5cd05ea66 100644
--- a/aegisub/src/subs_edit_box.cpp
+++ b/aegisub/src/subs_edit_box.cpp
@@ -345,19 +345,7 @@ void SubsEditBox::Update(int type) {
 
 	if (type == AssFile::COMMIT_NEW) {
 		/// @todo maybe preserve selection over undo?
-		ActorBox->Freeze();
-		ActorBox->Clear();
-		for (entryIter it = c->ass->Line.begin(); it != c->ass->Line.end(); ++it) {
-			if (AssDialogue *diag = dynamic_cast<AssDialogue*>(*it)) {
-				wxString actor = diag->Actor;
-				// OSX doesn't like combo boxes that are empty.
-				if (actor.empty()) actor = "Actor";
-				if (ActorBox->FindString(actor) == wxNOT_FOUND) {
-					ActorBox->Append(actor);
-				}
-			}
-		}
-		ActorBox->Thaw();
+		PopulateActorList();
 
 		TextEdit->SetSelection(0,0);
 		SetEvtHandlerEnabled(true);
@@ -386,16 +374,50 @@ void SubsEditBox::Update(int type) {
 		MarginL->ChangeValue(line->GetMarginString(0,false));
 		MarginR->ChangeValue(line->GetMarginString(1,false));
 		MarginV->ChangeValue(line->GetMarginString(2,false));
-		Effect->ChangeValue(line->Effect.empty() ?  "Effect" : line->Effect);
+		Effect->ChangeValue(line->Effect.empty() ? "Effect" : line->Effect);
 		CommentBox->SetValue(line->Comment);
 		StyleBox->Select(StyleBox->FindString(line->Style));
-		ActorBox->ChangeValue(line->Actor.empty() ?  "Actor" : line->Actor);
+
+		PopulateActorList();
+		ActorBox->ChangeValue(line->Actor.empty() ? "Actor" : line->Actor);
 		ActorBox->SetStringSelection(line->Actor);
 	}
 
 	SetEvtHandlerEnabled(true);
 }
 
+void SubsEditBox::PopulateActorList() {
+	std::set<wxString> actors;
+	for (entryIter it = c->ass->Line.begin(); it != c->ass->Line.end(); ++it) {
+		if (AssDialogue *diag = dynamic_cast<AssDialogue*>(*it))
+			actors.insert(diag->Actor);
+	}
+#ifdef __APPLE__
+	// OSX doesn't like combo boxes that are empty.
+	actors.insert("Actor");
+#endif
+	actors.erase("");
+	wxArrayString arrstr;
+	arrstr.reserve(actors.size());
+	copy(actors.begin(), actors.end(), std::back_inserter(arrstr));
+
+	ActorBox->Freeze();
+	bool evt_handler_was_enabled = GetEvtHandlerEnabled();
+	SetEvtHandlerEnabled(false);
+	long pos = ActorBox->GetInsertionPoint();
+	wxString value = ActorBox->GetValue();
+
+	ActorBox->Clear();
+	ActorBox->Append(arrstr);
+	ActorBox->ChangeValue(value);
+	ActorBox->SetStringSelection(value);
+	ActorBox->SetInsertionPoint(pos);
+
+	if (evt_handler_was_enabled)
+		SetEvtHandlerEnabled(true);
+	ActorBox->Thaw();
+}
+
 void SubsEditBox::OnActiveLineChanged(AssDialogue *new_line) {
 	SetEvtHandlerEnabled(false);
 	line = new_line;
@@ -468,24 +490,22 @@ void SubsEditBox::NextLine() {
 
 void SubsEditBox::OnChange(wxStyledTextEvent &event) {
 	if (line && TextEdit->GetText() != line->Text) {
-		file_changed_slot.Block();
 		if (event.GetModificationType() & wxSTC_MOD_INSERTTEXT) {
 			CommitText(_("insert text"));
 		}
 		else {
 			CommitText(_("delete text"));
 		}
-		file_changed_slot.Unblock();
 	}
 }
 
 template<class T, class setter>
 void SubsEditBox::SetSelectedRows(setter set, T value, wxString desc, int type, bool amend) {
-	using namespace std::tr1::placeholders;
-
-	for_each(sel.begin(), sel.end(), std::tr1::bind(set, _1, value));
+	for_each(sel.begin(), sel.end(), bind(set, std::tr1::placeholders::_1, value));
 
+	file_changed_slot.Block();
 	commitId = c->ass->Commit(desc, type, (amend && desc == lastCommitType) ? commitId : -1, sel.size() == 1 ? *sel.begin() : 0);
+	file_changed_slot.Unblock();
 	lastCommitType = desc;
 }
 
@@ -600,16 +620,8 @@ void SubsEditBox::OnStyleChange(wxCommandEvent &) {
 }
 
 void SubsEditBox::OnActorChange(wxCommandEvent &) {
-	wxString actor = ActorBox->GetValue();
-	SetSelectedRows(&AssDialogue::Actor, actor, _("actor change"), AssFile::COMMIT_DIAG_META);
-
-	// Add actor to list
-	if (!actor.empty() && ActorBox->GetCount() && ActorBox->GetString(0).empty()) {
-		ActorBox->Delete(0);
-	}
-	if (ActorBox->FindString(actor) == wxNOT_FOUND) {
-		ActorBox->Append(actor);
-	}
+	SetSelectedRows(&AssDialogue::Actor, ActorBox->GetValue(), _("actor change"), AssFile::COMMIT_DIAG_META);
+	PopulateActorList();
 }
 
 void SubsEditBox::OnLayerChange(wxSpinEvent &event) {
diff --git a/aegisub/src/subs_edit_box.h b/aegisub/src/subs_edit_box.h
index 8603c9ddb..844a9df7d 100644
--- a/aegisub/src/subs_edit_box.h
+++ b/aegisub/src/subs_edit_box.h
@@ -192,6 +192,9 @@ class SubsEditBox : public wxPanel, protected SelectionListener<AssDialogue> {
 	/// @param type AssFile::CommitType
 	void Update(int type);
 
+	/// Regenerate the contents of the actor dropdown list
+	void PopulateActorList();
+
 	/// @brief Enable or disable frame timing mode
 	void UpdateFrameTiming(agi::vfr::Framerate const& fps);
 public: