X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fscreen_dialog.cc;fp=src%2Fwx%2Fscreen_dialog.cc;h=6b58145eb367737c6bf6317f8b4b7d368bf43b8f;hp=c6991271675f3321e82886478fbad2a879bff1ea;hb=f0edd6ab35c3c2b7800a26ec8206adab75e5f633;hpb=14b1f672dc92ae8e1385c75e30420a4dcb4e32c9 diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc index c69912716..6b58145eb 100644 --- a/src/wx/screen_dialog.cc +++ b/src/wx/screen_dialog.cc @@ -19,7 +19,7 @@ #include #include -#include +#include #include "lib/compose.hpp" #include "lib/util.h" #include "screen_dialog.h" @@ -31,7 +31,7 @@ using std::string; using std::cout; using boost::shared_ptr; -ScreenDialog::ScreenDialog (wxWindow* parent, string title, string name, shared_ptr certificate) +ScreenDialog::ScreenDialog (wxWindow* parent, string title, string name, shared_ptr 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 +shared_ptr ScreenDialog::certificate () const { return _certificate; @@ -89,9 +89,9 @@ void ScreenDialog::load_certificate (boost::filesystem::path file) { try { - _certificate.reset (new libdcp::Certificate (file)); + _certificate.reset (new dcp::Certificate (file)); _certificate_text->SetValue (_certificate->certificate ()); - } catch (libdcp::MiscError& e) { + } 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 (FindWindowById (wxID_OK, this)); - ok->Enable (_certificate); + ok->Enable (_certificate.get ()); _download_certificate->Enable ( _manufacturer->GetStringSelection() == _("Doremi") ||