X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fscreen_dialog.cc;h=66e37a4cf94d58225b199fa8a88cef93fe19de22;hb=1858190cff2f960f3d1f0a5cc02c69da86088f5b;hp=503745683980f3b2a860ec09050c2b80bba01a84;hpb=ac35bf2a80c9afae9dc5fcb0261929053162f44d;p=dcpomatic.git diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc index 503745683..66e37a4cf 100644 --- a/src/wx/screen_dialog.cc +++ b/src/wx/screen_dialog.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2014 Carl Hetherington + Copyright (C) 2012-2015 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -26,6 +26,7 @@ #include "wx_util.h" #include "doremi_certificate_dialog.h" #include "dolby_certificate_dialog.h" +#include using std::string; using std::cout; @@ -44,7 +45,7 @@ ScreenDialog::ScreenDialog (wxWindow* parent, string title, string name, optiona add (_("Certificate"), true); wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); _load_certificate = new wxButton (this, wxID_ANY, _("Load from file...")); - _download_certificate = new wxButton (this, wxID_ANY, _("Download")); + _download_certificate = new wxButton (this, wxID_ANY, _("Download...")); s->Add (_load_certificate, 1, wxEXPAND); s->Add (_download_certificate, 1, wxEXPAND); add (s); @@ -128,7 +129,9 @@ void ScreenDialog::setup_sensitivity () { wxButton* ok = dynamic_cast (FindWindowById (wxID_OK, this)); - ok->Enable (_certificate); + if (ok) { + ok->Enable (_certificate); + } _download_certificate->Enable ( _manufacturer->GetStringSelection() == _("Doremi") ||