X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fscreen_dialog.h;h=66f3f422f186ec05a1d6fb6a18c55f172183337e;hb=2cbaf12dc99f55903a989736f2a9ce2db695028a;hp=5c6d964b8297681405d501543c14843f463d5253;hpb=cfdd68eb5fb0ef8423e860103ad4e5510994f1da;p=dcpomatic.git diff --git a/src/wx/screen_dialog.h b/src/wx/screen_dialog.h index 5c6d964b8..66f3f422f 100644 --- a/src/wx/screen_dialog.h +++ b/src/wx/screen_dialog.h @@ -17,32 +17,33 @@ */ +#include "table_dialog.h" +#include #include #include -#include -#include "table_dialog.h" +#include 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; };