X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fregion_subtag_widget.cc;h=1132410ddb68cad3b6a629e54c7918bddbb72cd6;hb=e8748f158249d7be906f6c6cf2411df45dd07a24;hp=3b0457f13974e593f9ebe9de34dedf4211a6c0e1;hpb=716f05c1301bc5cd811df687875cafaf0d37ffd2;p=dcpomatic.git diff --git a/src/wx/region_subtag_widget.cc b/src/wx/region_subtag_widget.cc index 3b0457f13..1132410dd 100644 --- a/src/wx/region_subtag_widget.cc +++ b/src/wx/region_subtag_widget.cc @@ -23,6 +23,7 @@ #include "full_language_tag_dialog.h" #include "region_subtag_dialog.h" #include "region_subtag_widget.h" +#include "wx_ptr.h" #include "wx_util.h" #include "lib/scope_guard.h" #include @@ -57,18 +58,10 @@ RegionSubtagWidget::RegionSubtagWidget(wxWindow* parent, wxString tooltip, optio } -RegionSubtagWidget::~RegionSubtagWidget() -{ - _region->Destroy(); - _edit->Destroy(); -} - - void RegionSubtagWidget::edit() { - auto d = new RegionSubtagDialog(_parent, _tag.get_value_or(dcp::LanguageTag::RegionSubtag("US"))); - ScopeGuard sg = [d]() { d->Destroy(); }; + auto d = make_wx(_parent, _tag.get_value_or(dcp::LanguageTag::RegionSubtag("US"))); if (d->ShowModal() == wxID_OK) { set(d->get());