Add wx_ptr and use it instead of ScopeGuard in a lot of places.

[dcpomatic.git] / src / wx / editable_list.h

diff --git a/src/wx/editable_list.h b/src/wx/editable_list.h
index f3a0dd957d01a11989640d4f6493df9caad5930f..f8050cac5a3b23b5266742b7d3647e4208e3b299 100644 (file)
--- a/src/wx/editable_list.h
+++ b/src/wx/editable_list.h
@@ -24,8 +24,8 @@
 
 
 #include "dcpomatic_button.h"
+#include "wx_ptr.h"
 #include "wx_util.h"
-#include "lib/scope_guard.h"
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
 #include <wx/listctrl.h>
@@ -233,8 +233,7 @@ private:
 
        void add_clicked ()
        {
-               S* dialog = new S (this);
-               ScopeGuard sg = [dialog]() { dialog->Destroy(); };
+               auto dialog = make_wx<S>(this);
 
                if (dialog->ShowModal() == wxID_OK) {
                        auto const v = dialog->get ();
@@ -258,8 +257,7 @@ private:
                std::vector<T> all = _get ();
                DCPOMATIC_ASSERT (item >= 0 && item < int (all.size ()));
 
-               S* dialog = new S (this);
-               ScopeGuard sg = [dialog]() { dialog->Destroy(); };
+               auto dialog = make_wx<S>(this);
                dialog->set (all[item]);
                if (dialog->ShowModal() == wxID_OK) {
                        auto const v = dialog->get ();