projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
BOOST_FOREACH.
[dcpomatic.git]
/
src
/
wx
/
templates_dialog.cc
diff --git
a/src/wx/templates_dialog.cc
b/src/wx/templates_dialog.cc
index 9b264f264f1842af3d260a06c270ed460fec4feb..e8f9b8a2b22516160f3400222b762fe601f6d62f 100644
(file)
--- 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 "templates_dialog.h"
#include "wx_util.h"
#include "rename_template_dialog.h"
+#include "dcpomatic_button.h"
#include "lib/config.h"
#include <wx/wx.h>
#include "lib/config.h"
#include <wx/wx.h>
-#include <boost/foreach.hpp>
using std::string;
using boost::bind;
using std::string;
using boost::bind;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
TemplatesDialog::TemplatesDialog (wxWindow* parent)
: wxDialog (parent, wxID_ANY, _("Templates"))
TemplatesDialog::TemplatesDialog (wxWindow* parent)
: wxDialog (parent, wxID_ANY, _("Templates"))
@@
-47,9
+50,9
@@
TemplatesDialog::TemplatesDialog (wxWindow* parent)
{
wxSizer* s = new wxBoxSizer (wxVERTICAL);
{
wxSizer* s = new wxBoxSizer (wxVERTICAL);
- _rename = new
wxButton (this, wxID_ANY
, _("Rename..."));
+ _rename = new
Button (this
, _("Rename..."));
s->Add (_rename, 0, wxTOP | wxBOTTOM, 2);
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);
}
s->Add (_remove, 0, wxTOP | wxBOTTOM, 2);
hs->Add (s, 0, wxLEFT, DCPOMATIC_SIZER_X_GAP);
}
@@
-78,7
+81,7
@@
TemplatesDialog::refresh ()
{
_list->DeleteAllItems ();
{
_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);
wxListItem list_item;
int const n = _list->GetItemCount ();
list_item.SetId (n);