X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fnag_dialog.cc;h=edaf8f83f6a41f97d0da29b7ae6d422be5478d3b;hp=417b5f94c55d94795fac0885b20af5a3af3b2c77;hb=8963f0007af1a312017b9627c18b82ec2a577591;hpb=b8065d1e496158895352f9fc54dc5ae2419ce6a3

diff --git a/src/wx/nag_dialog.cc b/src/wx/nag_dialog.cc
index 417b5f94c..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,22 +18,28 @@
 
 */
 
+
 #include "nag_dialog.h"
 #include "wx_util.h"
 #include "static_text.h"
 #include "check_box.h"
 
+
 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"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
+	: wxDialog (parent, wxID_ANY, _("Important notice"))
 	, _nag (nag)
 {
 	auto sizer = new wxBoxSizer (wxVERTICAL);
-	_text = new StaticText (this, wxEmptyString, wxDefaultPosition, wxSize (400, 300));
+	_text = new StaticText (this, wxEmptyString, wxDefaultPosition, wxSize(width, 300));
 	sizer->Add (_text, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
 
 	auto b = new CheckBox (this, _("Don't show this message again"));
@@ -44,29 +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);
-
-	Bind (wxEVT_SIZE, [this](wxSizeEvent& ev) {
-		Layout();
-		ev.Skip();
-	});
 }
 
+
 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)