X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fkdm_cpl_panel.cc;h=b1bbc1cf01d6d711aef38f0665f6a146474d3be3;hb=790db8faab093231664c402fcc33b0b96687e222;hp=be5e42dd8b9458a490b967027928c9982ffd5d6d;hpb=a5d004b0773f633401528392fc28e66d70e13ac8;p=dcpomatic.git

diff --git a/src/wx/kdm_cpl_panel.cc b/src/wx/kdm_cpl_panel.cc
index be5e42dd8..b1bbc1cf0 100644
--- 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.
 
@@ -18,27 +18,30 @@
 
 */
 
+
+#include "dcpomatic_button.h"
 #include "kdm_cpl_panel.h"
-#include "wx_util.h"
 #include "static_text.h"
-#include "dcpomatic_button.h"
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+#include "wx_util.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <libcxml/cxml.h>
 
+
 using std::vector;
 
+
 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 +95,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