{
public:
DOMFrame (wxString const & title)
- : wxFrame (NULL, -1, title)
+ : wxFrame (0, -1, title)
, _config_dialog (0)
, _job_view (0)
{
_create = new wxButton (overall_panel, wxID_ANY, _("Create KDMs"));
vertical->Add (_create, 0, wxALL, DCPOMATIC_SIZER_GAP);
- main_sizer->Add (vertical, 1, wxALL, DCPOMATIC_DIALOG_BORDER);
+ main_sizer->Add (vertical, 1, wxALL | wxEXPAND, DCPOMATIC_DIALOG_BORDER);
overall_panel->SetSizer (main_sizer);
/* Instantly save any config changes when using a DCP-o-matic GUI */
dcp::DecryptedKDM kdm (
dcp::LocalTime (_timing->from(), i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()),
dcp::LocalTime (_timing->until(), i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()),
- decrypted.annotation_text(),
+ decrypted.annotation_text().get_value_or (""),
decrypted.content_title_text(),
dcp::LocalTime().as_string()
);
wxString::Format (s, int(screen_kdms.size()), std_to_wx(_output->directory().string()).data())
);
} else {
- string film_name = decrypted.annotation_text ();
+ string film_name = decrypted.annotation_text().get_value_or ("");
if (film_name.empty ()) {
film_name = decrypted.content_title_text ();
}