From: Carl Hetherington Date: Mon, 16 Jan 2023 00:13:39 +0000 (+0100) Subject: It seems wrong to Destroy() these widgets as I think the parent will do it. X-Git-Tag: v2.16.41~41 X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=e8748f158249d7be906f6c6cf2411df45dd07a24 It seems wrong to Destroy() these widgets as I think the parent will do it. --- diff --git a/src/wx/language_tag_widget.cc b/src/wx/language_tag_widget.cc index d14c43f0c..1a6f3fabc 100644 --- a/src/wx/language_tag_widget.cc +++ b/src/wx/language_tag_widget.cc @@ -57,13 +57,6 @@ LanguageTagWidget::LanguageTagWidget (wxWindow* parent, wxString tooltip, option } -LanguageTagWidget::~LanguageTagWidget () -{ - _language->Destroy (); - _edit->Destroy (); -} - - void LanguageTagWidget::edit () { diff --git a/src/wx/language_tag_widget.h b/src/wx/language_tag_widget.h index 346b8bc75..1b97d03c7 100644 --- a/src/wx/language_tag_widget.h +++ b/src/wx/language_tag_widget.h @@ -37,7 +37,6 @@ class LanguageTagWidget { public: LanguageTagWidget (wxWindow* parent, wxString tooltip, boost::optional tag, boost::optional size_to_fit = boost::none); - ~LanguageTagWidget (); LanguageTagWidget (LanguageTagWidget const&) = delete; LanguageTagWidget& operator= (LanguageTagWidget const&) = delete; diff --git a/src/wx/region_subtag_widget.cc b/src/wx/region_subtag_widget.cc index 54c6d9d43..1132410dd 100644 --- a/src/wx/region_subtag_widget.cc +++ b/src/wx/region_subtag_widget.cc @@ -58,13 +58,6 @@ RegionSubtagWidget::RegionSubtagWidget(wxWindow* parent, wxString tooltip, optio } -RegionSubtagWidget::~RegionSubtagWidget() -{ - _region->Destroy(); - _edit->Destroy(); -} - - void RegionSubtagWidget::edit() { diff --git a/src/wx/region_subtag_widget.h b/src/wx/region_subtag_widget.h index 1fa5efe4e..725f8652c 100644 --- a/src/wx/region_subtag_widget.h +++ b/src/wx/region_subtag_widget.h @@ -40,7 +40,6 @@ class RegionSubtagWidget { public: RegionSubtagWidget(wxWindow* parent, wxString tooltip, boost::optional tag, boost::optional size_to_fit = boost::none); - ~RegionSubtagWidget(); RegionSubtagWidget(RegionSubtagWidget const&) = delete; RegionSubtagWidget& operator=(RegionSubtagWidget const&) = delete;