Build fixes for Boost >= 1.73

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

diff --git a/src/wx/confirm_kdm_email_dialog.cc b/src/wx/confirm_kdm_email_dialog.cc
index d622f2934524c7d20637485941bfe282f25fc89e..5b0c1510f154be7bfb906ffe7df852c6545e1285 100644 (file)
--- a/src/wx/confirm_kdm_email_dialog.cc
+++ b/src/wx/confirm_kdm_email_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2016-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -20,39 +20,33 @@
 
 #include "confirm_kdm_email_dialog.h"
 #include "wx_util.h"
+#include "static_text.h"
+#include "check_box.h"
 #include "lib/config.h"
-#include "lib/cinema_kdms.h"
 #include <boost/foreach.hpp>
 
 using std::list;
 using std::string;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 ConfirmKDMEmailDialog::ConfirmKDMEmailDialog (wxWindow* parent, list<string> emails)
-       : wxDialog (parent, wxID_ANY, _("Confirm KDM email"))
+       : QuestionDialog (parent, _("Confirm KDM email"), _("Send emails"), _("Don't send emails"))
 {
-       wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
-
        wxString message = _("Are you sure you want to send emails to the following addresses?\n\n");
        BOOST_FOREACH (string i, emails) {
                message += "\t" + std_to_wx (i) + "\n";
        }
 
-       sizer->Add (new wxStaticText (this, wxID_ANY, message), 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
+       _sizer->Add (new StaticText (this, message), 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
 
-       wxCheckBox* shut_up = new wxCheckBox (this, wxID_ANY, _("Don't ask this again"));
-       sizer->Add (shut_up, 0, wxALL, DCPOMATIC_DIALOG_BORDER);
+       wxCheckBox* shut_up = new CheckBox (this, _("Don't ask this again"));
+       _sizer->Add (shut_up, 0, wxALL, DCPOMATIC_DIALOG_BORDER);
 
        shut_up->Bind (wxEVT_CHECKBOX, bind (&ConfirmKDMEmailDialog::shut_up, this, _1));
 
-       wxStdDialogButtonSizer* buttons = CreateStdDialogButtonSizer (0);
-       sizer->Add (CreateSeparatedSizer(buttons), wxSizerFlags().Expand().DoubleBorder());
-       buttons->SetAffirmativeButton (new wxButton (this, wxID_OK, _("Send emails")));
-       buttons->SetNegativeButton (new wxButton (this, wxID_CANCEL, _("Don't send emails")));
-       buttons->Realize ();
-
-       SetSizer (sizer);
-       sizer->Layout ();
-       sizer->SetSizeHints (this);
+       layout ();
 }
 
 void