X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fscreen_dialog.cc;h=c7684d77fbad025a9ac845a0cb9bc0ddd1dd8c8e;hb=c6871fe8617b3de03662b7630355059393bf8043;hp=0ecf223e69e1c99a500f55d2fc35df47684db6fe;hpb=bb7917d2ea06e6eaa566b00a279e9b5a6a351fc9;p=dcpomatic.git

diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc
index 0ecf223e6..c7684d77f 100644
--- a/src/wx/screen_dialog.cc
+++ b/src/wx/screen_dialog.cc
@@ -45,7 +45,7 @@ column (dcp::Certificate c)
 class CertificateFileDialogWrapper : public FileDialogWrapper<dcp::Certificate>
 {
 public:
-	CertificateFileDialogWrapper (wxWindow* parent)
+	explicit CertificateFileDialogWrapper (wxWindow* parent)
 		: FileDialogWrapper<dcp::Certificate> (parent, _("Select certificate file"))
 	{
 
@@ -105,7 +105,6 @@ ScreenDialog::ScreenDialog (
 		columns,
 		bind (&ScreenDialog::trusted_devices, this),
 		bind (&ScreenDialog::set_trusted_devices, this, _1),
-		bind (&always_valid),
 		bind (&column, _1),
 		false
 		);
@@ -113,9 +112,9 @@ ScreenDialog::ScreenDialog (
 	_sizer->Add (_trusted_device_list, wxGBPosition (r, 0), wxGBSpan (1, 3), wxEXPAND);
 	++r;
 
-	_name->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ScreenDialog::setup_sensitivity, this));
-	_get_recipient_from_file->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ScreenDialog::get_recipient_from_file, this));
-	_download_recipient->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ScreenDialog::download_recipient, this));
+	_name->Bind (wxEVT_TEXT, boost::bind (&ScreenDialog::setup_sensitivity, this));
+	_get_recipient_from_file->Bind (wxEVT_BUTTON, boost::bind (&ScreenDialog::get_recipient_from_file, this));
+	_download_recipient->Bind (wxEVT_BUTTON, boost::bind (&ScreenDialog::download_recipient, this));
 
 	overall_sizer->Add (_sizer, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
 
@@ -156,7 +155,7 @@ ScreenDialog::load_recipient (boost::filesystem::path file)
 		dcp::CertificateChain c (dcp::file_to_string (file));
 		set_recipient (c.leaf ());
 	} catch (dcp::MiscError& e) {
-		error_dialog (this, wxString::Format (_("Could not read certificate file (%s)"), std_to_wx(e.what()).data()));
+		error_dialog (this, wxString::Format (_("Could not read certificate file.")), std_to_wx(e.what()));
 	}
 }