diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-07-21 16:53:58 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-07-21 16:53:58 +0100 |
| commit | ac35bf2a80c9afae9dc5fcb0261929053162f44d (patch) | |
| tree | 278ecb512c1dcc090b6e3fb38acf198afdb2b579 /src/wx/screen_dialog.cc | |
| parent | 504d613d3d7e8fbd3135e4e479ced1f51f520a04 (diff) | |
Adapt to changes in libdcp1 wrt shared_ptr and Certificate.
Diffstat (limited to 'src/wx/screen_dialog.cc')
| -rw-r--r-- | src/wx/screen_dialog.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc index 10650263b..503745683 100644 --- a/src/wx/screen_dialog.cc +++ b/src/wx/screen_dialog.cc @@ -29,9 +29,9 @@ using std::string; using std::cout; -using boost::shared_ptr; +using boost::optional; -ScreenDialog::ScreenDialog (wxWindow* parent, string title, string name, shared_ptr<dcp::Certificate> certificate) +ScreenDialog::ScreenDialog (wxWindow* parent, string title, string name, optional<dcp::Certificate> certificate) : TableDialog (parent, std_to_wx (title), 2, true) , _certificate (certificate) { @@ -79,7 +79,7 @@ ScreenDialog::name () const return wx_to_std (_name->GetValue()); } -shared_ptr<dcp::Certificate> +optional<dcp::Certificate> ScreenDialog::certificate () const { return _certificate; @@ -89,7 +89,7 @@ void ScreenDialog::load_certificate (boost::filesystem::path file) { try { - _certificate.reset (new dcp::Certificate (dcp::file_to_string (file))); + _certificate = dcp::Certificate (dcp::file_to_string (file)); _certificate_text->SetValue (_certificate->certificate ()); } catch (dcp::MiscError& e) { error_dialog (this, wxString::Format (_("Could not read certificate file (%s)"), e.what())); @@ -128,7 +128,7 @@ void ScreenDialog::setup_sensitivity () { wxButton* ok = dynamic_cast<wxButton*> (FindWindowById (wxID_OK, this)); - ok->Enable (_certificate.get ()); + ok->Enable (_certificate); _download_certificate->Enable ( _manufacturer->GetStringSelection() == _("Doremi") || |