X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fscreen_dialog.cc;h=716f9e9eb3db91dbdb16546a19447e0084e0558f;hp=ecac974e2dc5aa0cacdbebbfe9f17df2f9600283;hb=c103d8c1306e5fb3937b3a6c430a3fff32653fa3;hpb=701c510562bfa4fffcd21f94f0714405ca508a37 diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc index ecac974e2..716f9e9eb 100644 --- a/src/wx/screen_dialog.cc +++ b/src/wx/screen_dialog.cc @@ -27,13 +27,13 @@ #include "wx_util.h" #include "lib/compose.hpp" #include "lib/util.h" -#include "lib/warnings.h" +#include #include #include -DCPOMATIC_DISABLE_WARNINGS +LIBDCP_DISABLE_WARNINGS #include #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include @@ -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) { - error_dialog (this, wxString::Format(_("Could not load certficate (%s)"), std_to_wx(e.what()))); + error_dialog(this, wxString::Format(_("Could not load certificate (%s)"), std_to_wx(e.what()))); } } } @@ -178,7 +178,8 @@ ScreenDialog::ScreenDialog ( [] (TrustedDevice const& d, int) { return d.thumbprint(); }, - false + EditableListTitle::INVISIBLE, + EditableListButton::NEW | EditableListButton::EDIT | EditableListButton::REMOVE ); _sizer->Add (_trusted_device_list, wxGBPosition (r, 0), wxGBSpan (1, 3), wxEXPAND);