C++11 tidying.

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

diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc
index 6bfc0da4cbd15816fcaca9203aa4279b08a768fc..030098920b73e648955b05efb196a6a6ecd62ce5 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 "lib/warnings.h"
 #include <dcp/exceptions.h>
 #include <dcp/certificate_chain.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/filepicker.h>
 #include <wx/validate.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <iostream>
 
 using std::string;
@@ -38,6 +41,9 @@ using std::cout;
 using std::vector;
 using boost::optional;
 using boost::bind;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 static string
 column (TrustedDevice d)
@@ -63,12 +69,13 @@ public:
        void load_certificate ()
        {
                wxFileDialog* d = new wxFileDialog (this, _("Trusted Device certificate"));
-               d->ShowModal ();
-               try {
-                       _certificate = dcp::Certificate(dcp::file_to_string(wx_to_std(d->GetPath())));
-                       _thumbprint->SetValue (std_to_wx(_certificate->thumbprint()));
-               } catch (dcp::MiscError& e) {
-                       error_dialog (this, wxString::Format(_("Could not load certficate (%s)"), std_to_wx(e.what())));
+               if (d->ShowModal() == wxID_OK) {
+                       try {
+                               _certificate = dcp::Certificate(dcp::file_to_string(wx_to_std(d->GetPath())));
+                               _thumbprint->SetValue (std_to_wx(_certificate->thumbprint()));
+                       } catch (dcp::MiscError& e) {
+                               error_dialog (this, wxString::Format(_("Could not load certficate (%s)"), std_to_wx(e.what())));
+                       }
                }
        }
 
@@ -142,8 +149,8 @@ ScreenDialog::ScreenDialog (
        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,