pot/merge.

[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 96b9aa69745344c11a8bb55c1312e4e440e0e7c5..e14511ad8a45c94f7a7118c8be6b6c37175f0587 100644 (file)
--- a/src/wx/kdm_cpl_panel.cc
+++ b/src/wx/kdm_cpl_panel.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2015 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/>.
 
 */
 
@@ -35,7 +36,7 @@ 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 */
@@ -53,8 +54,8 @@ KDMCPLPanel::KDMCPLPanel (wxWindow* parent, vector<CPLSummary> cpls)
 
        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);
 }