X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Flanguage_tag_dialog.cc;h=b472edab07d1a5fda88d417129b23189ebe5b833;hb=34df545d56df724949f9974dbc20bd2857a2650a;hp=df2b74976649d2d90aa951f8e8ea5d359e6290df;hpb=3c29aa6531a4046a8db72dcac81189eb8893233c;p=dcpomatic.git

diff --git a/src/wx/language_tag_dialog.cc b/src/wx/language_tag_dialog.cc
index df2b74976..b472edab0 100644
--- a/src/wx/language_tag_dialog.cc
+++ b/src/wx/language_tag_dialog.cc
@@ -46,7 +46,7 @@ LanguageTagDialog::LanguageTagDialog (wxWindow* parent, dcp::LanguageTag tag)
 	overall_sizer->Add (_list, 0, wxALL, DCPOMATIC_SIZER_GAP);
 	overall_sizer->Add (add, 0, wxALL, DCPOMATIC_SIZER_GAP);
 
-	auto buttons = CreateSeparatedButtonSizer (wxOK);
+	auto buttons = CreateSeparatedButtonSizer(wxOK | wxCANCEL);
 	if (buttons) {
 		overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
 	}
@@ -68,19 +68,18 @@ LanguageTagDialog::LanguageTagDialog (wxWindow* parent, dcp::LanguageTag tag)
 	set (tag);
 
 	add->Bind (wxEVT_BUTTON, boost::bind(&LanguageTagDialog::add_language, this));
+	_list->Bind(wxEVT_LIST_ITEM_ACTIVATED, boost::bind(&LanguageTagDialog::EndModal, this, wxID_OK));
 }
 
 
 void
 LanguageTagDialog::add_language ()
 {
-	auto full = new FullLanguageTagDialog (GetParent());
-	auto r = full->ShowModal ();
-	if (r == wxID_OK) {
-		Config::instance()->add_custom_language (full->get());
-		set (full->get());
+	FullLanguageTagDialog full(GetParent());
+	if (full.ShowModal() == wxID_OK) {
+		Config::instance()->add_custom_language(full.get());
+		set(full.get());
 	}
-	full->Destroy ();
 }