X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fnag_dialog.cc;h=edaf8f83f6a41f97d0da29b7ae6d422be5478d3b;hp=2226938f349ead205077392df6c78cb1be069fa7;hb=fce82196feb1fbf5f89bfca19f383b93328f6239;hpb=9c1bb2e5ca7c80c4e26b1b2e41159aa171360a94

diff --git a/src/wx/nag_dialog.cc b/src/wx/nag_dialog.cc
index 2226938f3..edaf8f83f 100644
--- a/src/wx/nag_dialog.cc
+++ b/src/wx/nag_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2017-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2017-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,24 +18,31 @@
 
 */
 
+
 #include "nag_dialog.h"
 #include "wx_util.h"
 #include "static_text.h"
 #include "check_box.h"
-#include <wx/richtext/richtextctrl.h>
-#include <boost/foreach.hpp>
 
-using boost::shared_ptr;
+
+using std::shared_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+
+
+static constexpr int width = 400;
+
 
 NagDialog::NagDialog (wxWindow* parent, Config::Nag nag, wxString message, bool can_cancel)
 	: wxDialog (parent, wxID_ANY, _("Important notice"))
 	, _nag (nag)
 {
-	wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
-	_text = new StaticText (this, wxEmptyString, wxDefaultPosition, wxSize (400, 300));
-	sizer->Add (_text, 1, wxEXPAND | wxALL, 6);
+	auto sizer = new wxBoxSizer (wxVERTICAL);
+	_text = new StaticText (this, wxEmptyString, wxDefaultPosition, wxSize(width, 300));
+	sizer->Add (_text, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
 
-	wxCheckBox* b = new CheckBox (this, _("Don't show this message again"));
+	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));
 
@@ -43,24 +50,27 @@ NagDialog::NagDialog (wxWindow* parent, Config::Nag nag, wxString message, bool
 	if (can_cancel) {
 		flags |= wxCANCEL;
 	}
-	wxSizer* buttons = CreateSeparatedButtonSizer (flags);
+	auto buttons = CreateSeparatedButtonSizer (flags);
 	if (buttons) {
 		sizer->Add(buttons, wxSizerFlags().Expand().DoubleBorder());
 	}
 
+	_text->SetLabelMarkup (message);
+	_text->Wrap (width);
+
 	SetSizer (sizer);
 	sizer->Layout ();
 	sizer->SetSizeHints (this);
-
-	_text->SetLabelMarkup (message);
 }
 
+
 void
 NagDialog::shut_up (wxCommandEvent& ev)
 {
 	Config::instance()->set_nagged (_nag, ev.IsChecked());
 }
 
+
 /** @return true if the user clicked Cancel */
 bool
 NagDialog::maybe_nag (wxWindow* parent, Config::Nag nag, wxString message, bool can_cancel)
@@ -69,7 +79,7 @@ NagDialog::maybe_nag (wxWindow* parent, Config::Nag nag, wxString message, bool
 		return false;
 	}
 
-	NagDialog* d = new NagDialog (parent, nag, message, can_cancel);
+	auto d = new NagDialog (parent, nag, message, can_cancel);
 	int const r = d->ShowModal();
 	d->Destroy ();