X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fscreen_dialog.h;h=cf8d3da180dc14ab247911cd69ae1b3117ef69d7;hb=0242efb9802d7bcbde0701a7267972d4dbe5abb8;hp=5c6d964b8297681405d501543c14843f463d5253;hpb=9e4c091e6ef0f79fab10664e95240de2f14e5702;p=dcpomatic.git diff --git a/src/wx/screen_dialog.h b/src/wx/screen_dialog.h index 5c6d964b8..cf8d3da18 100644 --- a/src/wx/screen_dialog.h +++ b/src/wx/screen_dialog.h @@ -19,7 +19,7 @@ #include #include -#include +#include #include "table_dialog.h" class Progress; @@ -27,22 +27,22 @@ class Progress; class ScreenDialog : public TableDialog { public: - ScreenDialog (wxWindow *, std::string, std::string name = "", boost::shared_ptr c = boost::shared_ptr ()); + ScreenDialog (wxWindow *, std::string, std::string name = "", boost::optional c = boost::optional ()); std::string name () const; - boost::shared_ptr certificate () const; - + boost::optional certificate () const; + private: void select_certificate (); void load_certificate (boost::filesystem::path); void download_certificate (); void setup_sensitivity (); - + wxTextCtrl* _name; wxChoice* _manufacturer; wxButton* _load_certificate; wxButton* _download_certificate; wxTextCtrl* _certificate_text; - boost::shared_ptr _certificate; + boost::optional _certificate; };