Fix use-own-dirpicker build.

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

diff --git a/src/wx/recipient_dialog.cc b/src/wx/recipient_dialog.cc
index 94d5e3debc96ffa1c94d5990266185d83d289581..d59226a96e94abb2e101de54e047188e62c01a57 100644 (file)
--- a/src/wx/recipient_dialog.cc
+++ b/src/wx/recipient_dialog.cc
@@ -29,8 +29,11 @@
 #include "lib/util.h"
 #include <dcp/exceptions.h>
 #include <dcp/certificate_chain.h>
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/filepicker.h>
 #include <wx/validate.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <iostream>
 
 using std::string;
@@ -39,6 +42,9 @@ using std::vector;
 using std::list;
 using boost::optional;
 using boost::bind;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 
 static string
@@ -81,7 +87,7 @@ RecipientDialog::RecipientDialog (
        copy (emails.begin(), emails.end(), back_inserter (_emails));
 
        vector<EditableListColumn> columns;
-       columns.push_back (EditableListColumn(wx_to_std(_("Address"))));
+       columns.push_back (EditableListColumn(_("Address")));
        _email_list = new EditableList<string, EmailDialog> (
                this, columns, bind(&RecipientDialog::get_emails, this), bind(&RecipientDialog::set_emails, this, _1), bind(&column, _1)
                );