#include "language_tag_dialog.h"
#include "wx_util.h"
#include "lib/config.h"
+#include <dcp/language_tag.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/listctrl.h>
#include <wx/wx.h>
-#include <dcp/language_tag.h>
+LIBDCP_ENABLE_WARNINGS
using std::vector;
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());
}
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 ();
}