X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fdownload_certificate_panel.h;h=25271c7701dbb21ab26be7087f9c8bc23520e89f;hb=39fb8198febde1937019db1c300ec363aab5aa56;hp=d1f0bf4defbbaac96ec55a772d1ddf757f0920cc;hpb=a713e8258acc3f0e960c4e87ba8684902d29a591;p=dcpomatic.git diff --git a/src/wx/download_certificate_panel.h b/src/wx/download_certificate_panel.h index d1f0bf4de..25271c770 100644 --- a/src/wx/download_certificate_panel.h +++ b/src/wx/download_certificate_panel.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2014 Carl Hetherington + Copyright (C) 2014-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,15 +18,22 @@ */ + #ifndef DCPOMATIC_DOWNLOAD_CERTIFICATE_PANEL_H #define DCPOMATIC_DOWNLOAD_CERTIFICATE_PANEL_H + +#include "lib/warnings.h" #include +DCPOMATIC_DISABLE_WARNINGS #include +DCPOMATIC_ENABLE_WARNINGS #include + class DownloadCertificateDialog; + class DownloadCertificatePanel : public wxPanel { public: @@ -37,7 +44,8 @@ public: virtual bool ready_to_download () const; void download (); - void load (boost::filesystem::path); + boost::optional load_certificate (boost::filesystem::path); + boost::optional load_certificate_from_chain (boost::filesystem::path); boost::optional certificate () const; protected: @@ -50,4 +58,5 @@ private: boost::optional _certificate; }; + #endif