X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fvideo_waveform_dialog.cc;h=bc68fa6c2efe95e6b51729988533efded801ae48;hb=442eb6a8b78735c2987b16443646e9350b3d68e8;hp=f3d4a7aa527330d9d09718cfc6e8200295c0a5e8;hpb=9c1bb2e5ca7c80c4e26b1b2e41159aa171360a94;p=dcpomatic.git

diff --git a/src/wx/video_waveform_dialog.cc b/src/wx/video_waveform_dialog.cc
index f3d4a7aa5..bc68fa6c2 100644
--- a/src/wx/video_waveform_dialog.cc
+++ b/src/wx/video_waveform_dialog.cc
@@ -23,13 +23,17 @@
 #include "film_viewer.h"
 #include "wx_util.h"
 #include "static_text.h"
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <iostream>
 
 using std::cout;
 using boost::bind;
-using boost::weak_ptr;
-using boost::shared_ptr;
+using std::weak_ptr;
+using std::shared_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+
 
 VideoWaveformDialog::VideoWaveformDialog (wxWindow* parent, weak_ptr<const Film> film, weak_ptr<FilmViewer> viewer)
 	: wxDialog (
@@ -57,21 +61,21 @@ VideoWaveformDialog::VideoWaveformDialog (wxWindow* parent, weak_ptr<const Film>
 	_component->Append (wxT ("X"));
 	_component->Append (wxT ("Y"));
 	_component->Append (wxT ("Z"));
-	add_label_to_sizer (controls, this, _("Component"), true);
+	add_label_to_sizer (controls, this, _("Component"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 	controls->Add (_component, 1, wxALL, DCPOMATIC_SIZER_X_GAP);
 
-	add_label_to_sizer (controls, this, _("Contrast"), true);
+	add_label_to_sizer (controls, this, _("Contrast"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 	_contrast = new wxSlider (this, wxID_ANY, 0, 0, 256);
 	controls->Add (_contrast, 1, wxALL, DCPOMATIC_SIZER_X_GAP);
 
 	overall_sizer->Add (controls, 0, wxALL | wxEXPAND, DCPOMATIC_SIZER_X_GAP);
 
 	wxBoxSizer* position = new wxBoxSizer (wxHORIZONTAL);
-	add_label_to_sizer (position, this, _("Image X position"), true);
+	add_label_to_sizer (position, this, _("Image X position"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 	_x_position = new StaticText (this, "");
 	_x_position->SetMinSize (wxSize (64, -1));
 	position->Add (_x_position, 0, wxALL, DCPOMATIC_SIZER_X_GAP);
-	add_label_to_sizer (position, this, _("component value"), true);
+	add_label_to_sizer (position, this, _("component value"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 	_value = new StaticText (this, "");
 	_value->SetMinSize (wxSize (64, -1));
 	position->Add (_value, 0, wxALL, DCPOMATIC_SIZER_X_GAP);