X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Flanguage_tag_widget.cc;h=1a6f3fabc219dd799a137ed4873c154c9c7c91a0;hb=e8748f158249d7be906f6c6cf2411df45dd07a24;hp=f28046bd9be59628fe952734a6a7939f5fef8730;hpb=b7e65adf286ce20918797a06a910ededf8f07b7b;p=dcpomatic.git diff --git a/src/wx/language_tag_widget.cc b/src/wx/language_tag_widget.cc index f28046bd9..1a6f3fabc 100644 --- a/src/wx/language_tag_widget.cc +++ b/src/wx/language_tag_widget.cc @@ -22,6 +22,7 @@ #include "dcpomatic_button.h" #include "language_tag_dialog.h" #include "language_tag_widget.h" +#include "wx_ptr.h" #include "wx_util.h" #include "lib/scope_guard.h" #include @@ -56,18 +57,10 @@ LanguageTagWidget::LanguageTagWidget (wxWindow* parent, wxString tooltip, option } -LanguageTagWidget::~LanguageTagWidget () -{ - _language->Destroy (); - _edit->Destroy (); -} - - void LanguageTagWidget::edit () { - auto d = new LanguageTagDialog(_parent, _tag.get_value_or(dcp::LanguageTag("en"))); - ScopeGuard sg = [d]() { d->Destroy(); }; + auto d = make_wx(_parent, _tag.get_value_or(dcp::LanguageTag("en"))); if (d->ShowModal() == wxID_OK) { set(d->get()); Changed(d->get());