X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fdownload_certificate_panel.h;h=25271c7701dbb21ab26be7087f9c8bc23520e89f;hb=9b85acc342e0cbfc6a9f9533bb7067978bd1294e;hp=55594c74c66b6f1df48a43d927608594f54e6c93;hpb=f8acc34bcb4401184064598353d6c54df3cab1f9;p=dcpomatic.git diff --git a/src/wx/download_certificate_panel.h b/src/wx/download_certificate_panel.h index 55594c74c..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,17 +44,19 @@ 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: DownloadCertificateDialog* _dialog; wxFlexGridSizer* _table; wxTextCtrl* _serial; + wxSizer* _overall_sizer; private: - wxSizer* _overall_sizer; boost::optional _certificate; }; + #endif