diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-04-20 12:20:04 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-04-21 00:52:07 +0200 |
| commit | 2b38e2bb56be58db90577c42ec9f2f7586fb8e1c (patch) | |
| tree | c6f00d12b0112ebc59e1050d063721479c3011a8 | |
| parent | b413837ae91f4db1c2936f092b4327bbc0418f42 (diff) | |
C++11 tidying.
| -rw-r--r-- | src/wx/hints_dialog.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/wx/hints_dialog.cc b/src/wx/hints_dialog.cc index 2e53d8104..db576da16 100644 --- a/src/wx/hints_dialog.cc +++ b/src/wx/hints_dialog.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net> + Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net> This file is part of DCP-o-matic. @@ -18,6 +18,7 @@ */ + #include "hints_dialog.h" #include "wx_util.h" #include "static_text.h" @@ -30,6 +31,7 @@ DCPOMATIC_DISABLE_WARNINGS #include <wx/richtext/richtextctrl.h> DCPOMATIC_ENABLE_WARNINGS + using std::max; using std::vector; using std::string; @@ -42,13 +44,14 @@ using std::dynamic_pointer_cast; using namespace boost::placeholders; #endif + HintsDialog::HintsDialog (wxWindow* parent, std::weak_ptr<Film> film, bool ok) : wxDialog (parent, wxID_ANY, _("Hints")) , _film (film) , _hints (0) , _finished (false) { - wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL); + auto sizer = new wxBoxSizer (wxVERTICAL); _gauge = new wxGauge (this, wxID_ANY, 100); sizer->Add (_gauge, 0, wxALL | wxEXPAND, DCPOMATIC_SIZER_GAP); @@ -64,7 +67,7 @@ HintsDialog::HintsDialog (wxWindow* parent, std::weak_ptr<Film> film, bool ok) b->Bind (wxEVT_CHECKBOX, bind (&HintsDialog::shut_up, this, _1)); } - wxStdDialogButtonSizer* buttons = CreateStdDialogButtonSizer (0); + auto buttons = CreateStdDialogButtonSizer (0); sizer->Add (CreateSeparatedSizer(buttons), wxSizerFlags().Expand().DoubleBorder()); if (ok) { buttons->SetAffirmativeButton (new wxButton (this, wxID_OK)); @@ -81,7 +84,7 @@ HintsDialog::HintsDialog (wxWindow* parent, std::weak_ptr<Film> film, bool ok) _text->GetCaret()->Hide (); - std::shared_ptr<Film> locked_film = _film.lock (); + auto locked_film = _film.lock (); if (locked_film) { _film_change_connection = locked_film->Change.connect (boost::bind (&HintsDialog::film_change, this, _1)); _film_content_change_connection = locked_film->ContentChange.connect (boost::bind (&HintsDialog::film_content_change, this, _1)); @@ -90,6 +93,7 @@ HintsDialog::HintsDialog (wxWindow* parent, std::weak_ptr<Film> film, bool ok) film_change (ChangeType::DONE); } + void HintsDialog::film_change (ChangeType type) { |