Fix assertion with wxWidgets 3.1.

[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 55594c74c66b6f1df48a43d927608594f54e6c93..ba355f8138c30c3c4aa46ecace7f75a7dc3fbf3d 100644 (file)
--- a/src/wx/download_certificate_panel.h
+++ b/src/wx/download_certificate_panel.h
@@ -21,8 +21,11 @@
 #ifndef DCPOMATIC_DOWNLOAD_CERTIFICATE_PANEL_H
 #define DCPOMATIC_DOWNLOAD_CERTIFICATE_PANEL_H
 
+#include "lib/warnings.h"
 #include <dcp/certificate.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/optional.hpp>
 
 class DownloadCertificateDialog;
@@ -37,16 +40,17 @@ public:
        virtual bool ready_to_download () const;
 
        void download ();
-       void load (boost::filesystem::path);
+       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:
        DownloadCertificateDialog* _dialog;
        wxFlexGridSizer* _table;
        wxTextCtrl* _serial;
+       wxSizer* _overall_sizer;
 
 private:
-       wxSizer* _overall_sizer;
        boost::optional<dcp::Certificate> _certificate;
 };