X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fscreen_dialog.cc;h=71d0ed99d27dfe74d0f8326a2a4864387a8b0a14;hb=15ee4641d8b89a16b15611443870d0932152066f;hp=f5d4b044a68b68f4fd8ac867448616bef95bde1e;hpb=1e77753ef4119b6d7df7d2255b1a1d8d6af951de;p=dcpomatic.git

diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc
index f5d4b044a..71d0ed99d 100644
--- a/src/wx/screen_dialog.cc
+++ b/src/wx/screen_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -21,8 +21,10 @@
 #include "screen_dialog.h"
 #include "wx_util.h"
 #include "file_dialog_wrapper.h"
+#include "static_text.h"
 #include "download_certificate_dialog.h"
 #include "table_dialog.h"
+#include "dcpomatic_button.h"
 #include "lib/compose.hpp"
 #include "lib/util.h"
 #include <dcp/exceptions.h>
@@ -51,7 +53,7 @@ public:
 	{
 		add (_("Thumbprint"), true);
 		_thumbprint = add (new wxTextCtrl(this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(300, -1)));
-		_file = add (new wxButton(this, wxID_ANY, _("Load certificate...")));
+		_file = add (new Button(this, _("Load certificate...")));
 
 		layout ();
 
@@ -126,11 +128,11 @@ ScreenDialog::ScreenDialog (
 
 	add_label_to_sizer (_sizer, this, _("Recipient certificate"), true, wxGBPosition (r, 0));
 	wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-	_recipient_thumbprint = new wxStaticText (this, wxID_ANY, wxT (""), wxDefaultPosition, size);
+	_recipient_thumbprint = new StaticText (this, wxT (""), wxDefaultPosition, size);
 	_recipient_thumbprint->SetFont (font);
 	set_recipient (recipient);
-	_get_recipient_from_file = new wxButton (this, wxID_ANY, _("Get from file..."));
-	_download_recipient = new wxButton (this, wxID_ANY, _("Download..."));
+	_get_recipient_from_file = new Button (this, _("Get from file..."));
+	_download_recipient = new Button (this, _("Download..."));
 	s->Add (_recipient_thumbprint, 1, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP);
 	s->Add (_get_recipient_from_file, 0, wxLEFT | wxRIGHT | wxEXPAND, DCPOMATIC_SIZER_X_GAP);
 	s->Add (_download_recipient, 0, wxLEFT | wxRIGHT | wxEXPAND, DCPOMATIC_SIZER_X_GAP);
@@ -140,8 +142,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(wx_to_std(_("Thumbprint"))));
 	_trusted_device_list = new EditableList<TrustedDevice, TrustedDeviceDialog> (
 		this,
 		columns,