GTK3 KDM window fixes backported from v2.15.x.

[dcpomatic.git] / src / wx / download_certificate_panel.h

diff --git a/src/wx/download_certificate_panel.h b/src/wx/download_certificate_panel.h
index 258d5ab25372c5a6cdc724797b82596334f27be8..f10b42b00ca1d32b04a97a4dc282051112c7b0a7 100644 (file)
--- a/src/wx/download_certificate_panel.h
+++ b/src/wx/download_certificate_panel.h
@@ -30,23 +30,21 @@ class DownloadCertificateDialog;
 class DownloadCertificatePanel : public wxPanel
 {
 public:
-       DownloadCertificatePanel (wxWindow* parent, DownloadCertificateDialog* dialog);
+       DownloadCertificatePanel (DownloadCertificateDialog* dialog);
 
-       /* Do any setup that may take a noticeable amount of time */
-       virtual void setup () {}
-       virtual bool ready_to_download () const = 0;
-       virtual void do_download (wxStaticText* message) = 0;
+       virtual void do_download () = 0;
        virtual wxString name () const = 0;
+       virtual bool ready_to_download () const;
 
-       void download (wxStaticText* message);
-       void load (boost::filesystem::path);
+       void download ();
+       boost::optional<std::string> load_certificate (boost::filesystem::path);
+       boost::optional<std::string> load_certificate_from_chain (boost::filesystem::path);
        boost::optional<dcp::Certificate> certificate () const;
 
 protected:
-       void layout ();
-
        DownloadCertificateDialog* _dialog;
        wxFlexGridSizer* _table;
+       wxTextCtrl* _serial;
 
 private:
        wxSizer* _overall_sizer;