X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftemplates_dialog.cc;h=e8f9b8a2b22516160f3400222b762fe601f6d62f;hb=a5d004b0773f633401528392fc28e66d70e13ac8;hp=9b264f264f1842af3d260a06c270ed460fec4feb;hpb=ad5c8849fc3ef5aad88201f28db5474a60db4436;p=dcpomatic.git diff --git a/src/wx/templates_dialog.cc b/src/wx/templates_dialog.cc index 9b264f264..e8f9b8a2b 100644 --- a/src/wx/templates_dialog.cc +++ b/src/wx/templates_dialog.cc @@ -21,12 +21,15 @@ #include "templates_dialog.h" #include "wx_util.h" #include "rename_template_dialog.h" +#include "dcpomatic_button.h" #include "lib/config.h" #include -#include using std::string; using boost::bind; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif TemplatesDialog::TemplatesDialog (wxWindow* parent) : wxDialog (parent, wxID_ANY, _("Templates")) @@ -47,9 +50,9 @@ TemplatesDialog::TemplatesDialog (wxWindow* parent) { wxSizer* s = new wxBoxSizer (wxVERTICAL); - _rename = new wxButton (this, wxID_ANY, _("Rename...")); + _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); } @@ -78,7 +81,7 @@ 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);