projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump libdcp for fix to #2344.
[dcpomatic.git]
/
src
/
wx
/
screen_dialog.cc
diff --git
a/src/wx/screen_dialog.cc
b/src/wx/screen_dialog.cc
index 58ea8a3285119a184a2d9441a30a081c25bd44d6..716f9e9eb3db91dbdb16546a19447e0084e0558f 100644
(file)
--- a/
src/wx/screen_dialog.cc
+++ b/
src/wx/screen_dialog.cc
@@
-70,7
+70,7
@@
public:
_certificate = dcp::Certificate(dcp::file_to_string(wx_to_std(d->GetPath())));
_thumbprint->SetValue (std_to_wx(_certificate->thumbprint()));
} catch (dcp::MiscError& e) {
_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 cert
ficate (%s)"), std_to_wx(e.what())));
+ error_dialog
(this, wxString::Format(_("Could not load certi
ficate (%s)"), std_to_wx(e.what())));
}
}
}
}
}
}
@@
-178,8
+178,8
@@
ScreenDialog::ScreenDialog (
[] (TrustedDevice const& d, int) {
return d.thumbprint();
},
[] (TrustedDevice const& d, int) {
return d.thumbprint();
},
- EditableList
Button::NEW | EditableListButton::EDIT | EditableListButton::REMOV
E,
- false
+ EditableList
Title::INVISIBL
E,
+ EditableListButton::NEW | EditableListButton::EDIT | EditableListButton::REMOVE
);
_sizer->Add (_trusted_device_list, wxGBPosition (r, 0), wxGBSpan (1, 3), wxEXPAND);
);
_sizer->Add (_trusted_device_list, wxGBPosition (r, 0), wxGBSpan (1, 3), wxEXPAND);