projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Missing #includes from previous.
[dcpomatic.git]
/
src
/
wx
/
screen_dialog.cc
diff --git
a/src/wx/screen_dialog.cc
b/src/wx/screen_dialog.cc
index 6bfc0da4cbd15816fcaca9203aa4279b08a768fc..7f309ba66aae9862bce0cae550c3b22fe8575e97 100644
(file)
--- a/
src/wx/screen_dialog.cc
+++ b/
src/wx/screen_dialog.cc
@@
-27,10
+27,13
@@
#include "dcpomatic_button.h"
#include "lib/compose.hpp"
#include "lib/util.h"
#include "dcpomatic_button.h"
#include "lib/compose.hpp"
#include "lib/util.h"
+#include "lib/warnings.h"
#include <dcp/exceptions.h>
#include <dcp/certificate_chain.h>
#include <dcp/exceptions.h>
#include <dcp/certificate_chain.h>
+DCPOMATIC_DISABLE_WARNINGS
#include <wx/filepicker.h>
#include <wx/validate.h>
#include <wx/filepicker.h>
#include <wx/validate.h>
+DCPOMATIC_ENABLE_WARNINGS
#include <iostream>
using std::string;
#include <iostream>
using std::string;
@@
-38,6
+41,9
@@
using std::cout;
using std::vector;
using boost::optional;
using boost::bind;
using std::vector;
using boost::optional;
using boost::bind;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
static string
column (TrustedDevice d)
static string
column (TrustedDevice d)
@@
-142,8
+148,8
@@
ScreenDialog::ScreenDialog (
add_label_to_sizer (_sizer, this, _("Other trusted devices"), true, wxGBPosition (r, 0));
++r;
add_label_to_sizer (_sizer, this, _("Other trusted devices"), true, wxGBPosition (r, 0));
++r;
- vector<
string
> columns;
- columns.push_back (
wx_to_std
(_("Thumbprint")));
+ vector<
EditableListColumn
> columns;
+ columns.push_back (
EditableListColumn
(_("Thumbprint")));
_trusted_device_list = new EditableList<TrustedDevice, TrustedDeviceDialog> (
this,
columns,
_trusted_device_list = new EditableList<TrustedDevice, TrustedDeviceDialog> (
this,
columns,