It seems wrong to Destroy() these widgets as I think the parent will do it.

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

diff --git a/src/wx/language_tag_widget.cc b/src/wx/language_tag_widget.cc
index 37b7f6209fe5a222c4a2cfdf3bb8c3923b559bcc..1a6f3fabc219dd799a137ed4873c154c9c7c91a0 100644 (file)
--- a/src/wx/language_tag_widget.cc
+++ b/src/wx/language_tag_widget.cc
@@ -22,7 +22,9 @@
 #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 <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
@@ -55,22 +57,14 @@ 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")));
+       auto d = make_wx<LanguageTagDialog>(_parent, _tag.get_value_or(dcp::LanguageTag("en")));
        if (d->ShowModal() == wxID_OK) {
                set(d->get());
                Changed(d->get());
        }
-       d->Destroy ();
 }