Allow resizing of nag dialog; may help with #1978.

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

diff --git a/src/wx/nag_dialog.cc b/src/wx/nag_dialog.cc
index 466b80b6bb0baf77b5948dcc26dd10e22cf0a1c8..417b5f94c55d94795fac0885b20af5a3af3b2c77 100644 (file)
--- a/src/wx/nag_dialog.cc
+++ b/src/wx/nag_dialog.cc
@@ -29,14 +29,14 @@ using namespace boost::placeholders;
 #endif
 
 NagDialog::NagDialog (wxWindow* parent, Config::Nag nag, wxString message, bool can_cancel)
-       : wxDialog (parent, wxID_ANY, _("Important notice"))
+       : wxDialog (parent, wxID_ANY, _("Important notice"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
        , _nag (nag)
 {
-       wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
+       auto sizer = new wxBoxSizer (wxVERTICAL);
        _text = new StaticText (this, wxEmptyString, wxDefaultPosition, wxSize (400, 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));
 
@@ -54,6 +54,11 @@ NagDialog::NagDialog (wxWindow* parent, Config::Nag nag, wxString message, bool
        sizer->SetSizeHints (this);
 
        _text->SetLabelMarkup (message);
+
+       Bind (wxEVT_SIZE, [this](wxSizeEvent& ev) {
+               Layout();
+               ev.Skip();
+       });
 }
 
 void
@@ -70,7 +75,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 ();