Cleanup: replace some list with vector.

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

diff --git a/src/wx/nag_dialog.cc b/src/wx/nag_dialog.cc
index edaf8f83f6a41f97d0da29b7ae6d422be5478d3b..b137b07d18668b11b7647cf991765b44aa126840 100644 (file)
--- a/src/wx/nag_dialog.cc
+++ b/src/wx/nag_dialog.cc
@@ -19,10 +19,10 @@
 */
 
 
+#include "check_box.h"
 #include "nag_dialog.h"
-#include "wx_util.h"
 #include "static_text.h"
-#include "check_box.h"
+#include "wx_util.h"
 
 
 using std::shared_ptr;
@@ -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;
 }