More stack-allocated Dialog objects.

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

diff --git a/src/wx/nag_dialog.cc b/src/wx/nag_dialog.cc
index 21d1c823e0bb949a758b6463d8662c87195166a7..b137b07d18668b11b7647cf991765b44aa126840 100644 (file)
--- a/src/wx/nag_dialog.cc
+++ b/src/wx/nag_dialog.cc
@@ -44,7 +44,7 @@ NagDialog::NagDialog (wxWindow* parent, Config::Nag nag, wxString message, bool
 
        auto b = new CheckBox (this, _("Don't show this message again"));
        sizer->Add (b, 0, wxALL, 6);
-       b->Bind (wxEVT_CHECKBOX, bind (&NagDialog::shut_up, this, _1));
+       b->bind(&NagDialog::shut_up, this, _1);
 
        int flags = wxOK;
        if (can_cancel) {
@@ -79,9 +79,6 @@ NagDialog::maybe_nag (wxWindow* parent, Config::Nag nag, wxString message, bool
                return false;
        }
 
-       auto d = new NagDialog (parent, nag, message, can_cancel);
-       int const r = d->ShowModal();
-       d->Destroy ();
-
-       return r == wxID_CANCEL;
+       NagDialog dialog(parent, nag, message, can_cancel);
+       return dialog.ShowModal() == wxID_CANCEL;
 }