X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftemplates_dialog.cc;h=b47c366abeb6e0610541749b34fd78a4e4b91bd6;hb=6d686ea45f5cd01a0d11f92a903ac77779ad8562;hp=9b264f264f1842af3d260a06c270ed460fec4feb;hpb=ad5c8849fc3ef5aad88201f28db5474a60db4436;p=dcpomatic.git

diff --git a/src/wx/templates_dialog.cc b/src/wx/templates_dialog.cc
index 9b264f264..b47c366ab 100644
--- a/src/wx/templates_dialog.cc
+++ b/src/wx/templates_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2016-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,15 +18,24 @@
 
 */
 
+
+#include "dcpomatic_button.h"
+#include "rename_template_dialog.h"
 #include "templates_dialog.h"
 #include "wx_util.h"
-#include "rename_template_dialog.h"
 #include "lib/config.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-#include <boost/foreach.hpp>
+LIBDCP_ENABLE_WARNINGS
+
 
 using std::string;
 using boost::bind;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+
 
 TemplatesDialog::TemplatesDialog (wxWindow* parent)
 	: wxDialog (parent, wxID_ANY, _("Templates"))
@@ -34,7 +43,7 @@ TemplatesDialog::TemplatesDialog (wxWindow* parent)
 	_sizer = new wxBoxSizer (wxVERTICAL);
 	SetSizer (_sizer);
 
-	wxSizer* hs = new wxBoxSizer (wxHORIZONTAL);
+	auto hs = new wxBoxSizer (wxHORIZONTAL);
 	_list = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxSize (200, 100), wxLC_REPORT | wxLC_SINGLE_SEL);
 
 	wxListItem ip;
@@ -46,39 +55,40 @@ TemplatesDialog::TemplatesDialog (wxWindow* parent)
 	hs->Add (_list, 1, wxEXPAND, DCPOMATIC_SIZER_GAP);
 
 	{
-		wxSizer* s = new wxBoxSizer (wxVERTICAL);
-		_rename = new wxButton (this, wxID_ANY, _("Rename..."));
+		auto s = new wxBoxSizer (wxVERTICAL);
+		_rename = new Button (this, _("Rename..."));
 		s->Add (_rename, 0, wxTOP | wxBOTTOM, 2);
-		_remove = new wxButton (this, wxID_ANY, _("Remove"));
+		_remove = new Button (this, _("Remove"));
 		s->Add (_remove, 0, wxTOP | wxBOTTOM, 2);
 		hs->Add (s, 0, wxLEFT, DCPOMATIC_SIZER_X_GAP);
 	}
 
 	_sizer->Add (hs, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
 
-	wxSizer* buttons = CreateSeparatedButtonSizer (wxCLOSE);
+	auto buttons = CreateSeparatedButtonSizer (wxCLOSE);
 	if (buttons) {
 		_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
 	}
 
-	_rename->Bind (wxEVT_BUTTON, bind (&TemplatesDialog::rename_clicked, this));
-	_remove->Bind (wxEVT_BUTTON, bind (&TemplatesDialog::remove_clicked, this));
+	_rename->Bind (wxEVT_BUTTON, bind(&TemplatesDialog::rename_clicked, this));
+	_remove->Bind (wxEVT_BUTTON, bind(&TemplatesDialog::remove_clicked, this));
 
-	_list->Bind (wxEVT_LIST_ITEM_SELECTED, bind (&TemplatesDialog::selection_changed, this));
-	_list->Bind (wxEVT_LIST_ITEM_DESELECTED, bind (&TemplatesDialog::selection_changed, this));
-	_list->Bind (wxEVT_SIZE, bind (&TemplatesDialog::resized, this, _1));
-	_config_connection = Config::instance()->Changed.connect (bind (&TemplatesDialog::refresh, this));
+	_list->Bind (wxEVT_LIST_ITEM_SELECTED, bind(&TemplatesDialog::selection_changed, this));
+	_list->Bind (wxEVT_LIST_ITEM_DESELECTED, bind(&TemplatesDialog::selection_changed, this));
+	_list->Bind (wxEVT_SIZE, bind(&TemplatesDialog::resized, this, _1));
+	_config_connection = Config::instance()->Changed.connect (bind(&TemplatesDialog::refresh, this));
 
 	refresh ();
 	selection_changed ();
 }
 
+
 void
 TemplatesDialog::refresh ()
 {
 	_list->DeleteAllItems ();
 
-	BOOST_FOREACH (string i, Config::instance()->templates()) {
+	for (auto i: Config::instance()->templates()) {
 		wxListItem list_item;
 		int const n = _list->GetItemCount ();
 		list_item.SetId (n);
@@ -87,12 +97,14 @@ TemplatesDialog::refresh ()
 	}
 }
 
+
 void
 TemplatesDialog::layout ()
 {
 	_sizer->Layout ();
 }
 
+
 void
 TemplatesDialog::selection_changed ()
 {
@@ -101,6 +113,7 @@ TemplatesDialog::selection_changed ()
 	_remove->Enable (i >= 0);
 }
 
+
 void
 TemplatesDialog::rename_clicked ()
 {
@@ -115,7 +128,7 @@ TemplatesDialog::rename_clicked ()
 	li.m_mask = wxLIST_MASK_TEXT;
 	_list->GetItem (li);
 
-	RenameTemplateDialog* d = new RenameTemplateDialog (this);
+	auto d = new RenameTemplateDialog (this);
 	d->set (li.m_text);
 	if (d->ShowModal() == wxID_OK) {
 		if (!d->get().IsEmpty()) {
@@ -128,6 +141,7 @@ TemplatesDialog::rename_clicked ()
 	d->Destroy ();
 }
 
+
 void
 TemplatesDialog::remove_clicked ()
 {
@@ -142,12 +156,13 @@ TemplatesDialog::remove_clicked ()
 	li.m_mask = wxLIST_MASK_TEXT;
 	_list->GetItem (li);
 
-	Config::instance()->delete_template (wx_to_std (li.m_text));
+	Config::instance()->delete_template (wx_to_std(li.m_text));
 	_list->DeleteItem (i);
 
 	selection_changed ();
 }
 
+
 void
 TemplatesDialog::resized (wxSizeEvent& ev)
 {