Add DCPOMATIC_CHOICE_TOP_PAD.

[dcpomatic.git] / src / wx / kdm_cpl_panel.cc

diff --git a/src/wx/kdm_cpl_panel.cc b/src/wx/kdm_cpl_panel.cc
index be5e42dd8b9458a490b967027928c9982ffd5d6d..f45fc529164f7ef760ebc39979335a13d067982f 100644 (file)
--- a/src/wx/kdm_cpl_panel.cc
+++ b/src/wx/kdm_cpl_panel.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2015-2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -34,11 +34,11 @@ KDMCPLPanel::KDMCPLPanel (wxWindow* parent, vector<CPLSummary> cpls)
        : wxPanel (parent, wxID_ANY)
        , _cpls (cpls)
 {
-       wxBoxSizer* vertical = new wxBoxSizer (wxVERTICAL);
+       auto vertical = new wxBoxSizer (wxVERTICAL);
 
        /* CPL choice */
-       wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-       add_label_to_sizer (s, this, _("CPL"), true);
+       auto s = new wxBoxSizer (wxHORIZONTAL);
+       add_label_to_sizer (s, this, _("CPL"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL);
        _cpl = new wxChoice (this, wxID_ANY);
        s->Add (_cpl, 1, wxEXPAND);
        _cpl_browse = new Button (this, _("Browse..."));
@@ -92,7 +92,7 @@ KDMCPLPanel::update_cpl_summary ()
 
        _dcp_directory->SetLabel (std_to_wx (_cpls[n].dcp_directory));
        _cpl_id->SetLabel (std_to_wx (_cpls[n].cpl_id));
-       _cpl_annotation_text->SetLabel (std_to_wx (_cpls[n].cpl_annotation_text));
+       _cpl_annotation_text->SetLabel (std_to_wx(_cpls[n].cpl_annotation_text.get_value_or("")));
 }
 
 void