Cleanup: use a Choice rather than a wxChoice.

2 files changed, 5 insertions, 3 deletions

diff --git a/src/wx/film_name_location_dialog.cc b/src/wx/film_name_location_dialog.cc
index 5c6f97f99..384dff8d6 100644
--- a/src/wx/film_name_location_dialog.cc
+++ b/src/wx/film_name_location_dialog.cc
@@ -20,6 +20,7 @@
 
 
 #include "check_box.h"
+#include "dcpomatic_choice.h"
 #include "film_name_location_dialog.h"
 #include "wx_util.h"
 /* This must come after wx_util.h as it defines DCPOMATIC_USE_OWN_PICKER */
@@ -65,7 +66,7 @@ FilmNameLocationDialog::FilmNameLocationDialog (wxWindow* parent, wxString title
 	if (offer_templates) {
 		_use_template = new CheckBox (this, _("From template"));
 		add (_use_template);
-		_template_name = new wxChoice (this, wxID_ANY);
+		_template_name = new Choice(this);
 		add (_template_name);
 	}
 
@@ -75,7 +76,7 @@ FilmNameLocationDialog::FilmNameLocationDialog (wxWindow* parent, wxString title
 		_template_name->Enable (false);
 
 		for (auto i: Config::instance()->templates ()) {
-			_template_name->Append (std_to_wx(i));
+			_template_name->add(i);
 		}
 
 		_use_template->bind(&FilmNameLocationDialog::use_template_clicked, this);
diff --git a/src/wx/film_name_location_dialog.h b/src/wx/film_name_location_dialog.h
index 083d07cd4..72229362e 100644
--- a/src/wx/film_name_location_dialog.h
+++ b/src/wx/film_name_location_dialog.h
@@ -29,6 +29,7 @@ LIBDCP_ENABLE_WARNINGS
 
 
 class CheckBox;
+class Choice;
 class DirPickerCtrl;
 
 
@@ -53,7 +54,7 @@ private:
 	wxDirPickerCtrl* _folder;
 #endif
 	CheckBox* _use_template;
-	wxChoice* _template_name;
+	Choice* _template_name;
 	static boost::optional<boost::filesystem::path> _directory;
 };