X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fkdm_cpl_panel.cc;h=d710d88aaef571aa3d4d24501faafb6ce1747283;hb=9c1bb2e5ca7c80c4e26b1b2e41159aa171360a94;hp=96b9aa69745344c11a8bb55c1312e4e440e0e7c5;hpb=b6a6cda147625ccd09738cd338136ea5911a95e8;p=dcpomatic.git

diff --git a/src/wx/kdm_cpl_panel.cc b/src/wx/kdm_cpl_panel.cc
index 96b9aa697..d710d88aa 100644
--- a/src/wx/kdm_cpl_panel.cc
+++ b/src/wx/kdm_cpl_panel.cc
@@ -1,24 +1,26 @@
 /*
-    Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2018 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
 #include "kdm_cpl_panel.h"
 #include "wx_util.h"
+#include "static_text.h"
 #include <libcxml/cxml.h>
 
 using std::vector;
@@ -35,26 +37,26 @@ KDMCPLPanel::KDMCPLPanel (wxWindow* parent, vector<CPLSummary> cpls)
 	_cpl = new wxChoice (this, wxID_ANY);
 	s->Add (_cpl, 1, wxEXPAND);
 	_cpl_browse = new wxButton (this, wxID_ANY, _("Browse..."));
-	s->Add (_cpl_browse, 0);
+	s->Add (_cpl_browse, 0, wxALIGN_CENTER_VERTICAL);
 	vertical->Add (s, 0, wxEXPAND | wxTOP, DCPOMATIC_SIZER_GAP + 2);
 
 	/* CPL details */
 	wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
 	add_label_to_sizer (table, this, _("DCP directory"), true);
-	_dcp_directory = new wxStaticText (this, wxID_ANY, "");
+	_dcp_directory = new StaticText (this, "");
 	table->Add (_dcp_directory);
 	add_label_to_sizer (table, this, _("CPL ID"), true);
-	_cpl_id = new wxStaticText (this, wxID_ANY, "");
+	_cpl_id = new StaticText (this, "");
 	table->Add (_cpl_id);
 	add_label_to_sizer (table, this, _("CPL annotation text"), true);
-	_cpl_annotation_text = new wxStaticText (this, wxID_ANY, "");
+	_cpl_annotation_text = new StaticText (this, "");
 	table->Add (_cpl_annotation_text);
 	vertical->Add (table, 0, wxEXPAND | wxTOP, DCPOMATIC_SIZER_GAP + 2);
 
 	update_cpl_choice ();
 
-	_cpl->Bind        (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&KDMCPLPanel::update_cpl_summary, this));
-	_cpl_browse->Bind (wxEVT_COMMAND_BUTTON_CLICKED,  boost::bind (&KDMCPLPanel::cpl_browse_clicked, this));
+	_cpl->Bind        (wxEVT_CHOICE, boost::bind (&KDMCPLPanel::update_cpl_summary, this));
+	_cpl_browse->Bind (wxEVT_BUTTON,  boost::bind (&KDMCPLPanel::cpl_browse_clicked, this));
 
 	SetSizerAndFit (vertical);
 }