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 d14c43f0c5c76903115e3122a20819bd74f1042d..1a6f3fabc219dd799a137ed4873c154c9c7c91a0 100644 (file)
--- 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 ()
 {
 void
 LanguageTagWidget::edit ()
 {

diff --git a/src/wx/language_tag_widget.h b/src/wx/language_tag_widget.h
index 346b8bc752df11d9fefbb94a1441a6a5c03a031e..1b97d03c7343cceddef2981c478b9be8aa1c4487 100644 (file)
--- 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<dcp::LanguageTag> tag, boost::optional<wxString> size_to_fit = boost::none);
 {
 public:
        LanguageTagWidget (wxWindow* parent, wxString tooltip, boost::optional<dcp::LanguageTag> tag, boost::optional<wxString> size_to_fit = boost::none);

-       ~LanguageTagWidget ();

 
        LanguageTagWidget (LanguageTagWidget const&) = delete;
        LanguageTagWidget& operator= (LanguageTagWidget const&) = delete;
 
        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 54c6d9d4303f98f082c52d20659a0c9b71259cfc..1132410ddb68cad3b6a629e54c7918bddbb72cd6 100644 (file)
--- 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()
 {
 void
 RegionSubtagWidget::edit()
 {

diff --git a/src/wx/region_subtag_widget.h b/src/wx/region_subtag_widget.h
index 1fa5efe4ef9bc0f22248f4575daeefbdac46cb23..725f8652c0638c6b7f9110e1dd656b4721afc1fd 100644 (file)
--- 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<dcp::LanguageTag::RegionSubtag> tag, boost::optional<wxString> size_to_fit = boost::none);
 {
 public:
        RegionSubtagWidget(wxWindow* parent, wxString tooltip, boost::optional<dcp::LanguageTag::RegionSubtag> tag, boost::optional<wxString> size_to_fit = boost::none);

-       ~RegionSubtagWidget();

 
        RegionSubtagWidget(RegionSubtagWidget const&) = delete;
        RegionSubtagWidget& operator=(RegionSubtagWidget const&) = delete;
 
        RegionSubtagWidget(RegionSubtagWidget const&) = delete;
        RegionSubtagWidget& operator=(RegionSubtagWidget const&) = delete;