X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fscreen_dialog.cc;h=71d0ed99d27dfe74d0f8326a2a4864387a8b0a14;hb=e9e8951e0961564121f9c6cc4ce87555eebf9ec8;hp=e8361dcd83581d751f2200771cfa202dac7f2eac;hpb=9c1bb2e5ca7c80c4e26b1b2e41159aa171360a94;p=dcpomatic.git

diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc
index e8361dcd8..71d0ed99d 100644
--- a/src/wx/screen_dialog.cc
+++ b/src/wx/screen_dialog.cc
@@ -24,6 +24,7 @@
 #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>
@@ -52,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 ();
 
@@ -130,8 +131,8 @@ ScreenDialog::ScreenDialog (
 	_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);
@@ -141,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,