Supporters update.

[dcpomatic.git] / src / wx / language_tag_dialog.cc

diff --git a/src/wx/language_tag_dialog.cc b/src/wx/language_tag_dialog.cc
index 91ac3512dfa96a1fb0d993d89e6cf53389a10a27..a3ad847d52b9c98d6bb375d3b69811f15ee47859 100644 (file)
--- a/src/wx/language_tag_dialog.cc
+++ b/src/wx/language_tag_dialog.cc
@@ -23,12 +23,12 @@
 #include "language_tag_dialog.h"
 #include "wx_util.h"
 #include "lib/config.h"
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/language_tag.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/listctrl.h>
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
-#include <dcp/language_tag.h>
+LIBDCP_ENABLE_WARNINGS
 
 
 using std::vector;
@@ -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,6 +68,7 @@ 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));
 }