X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fvideo_waveform_dialog.cc;h=bc68fa6c2efe95e6b51729988533efded801ae48;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hp=6b0ed44104b655366ecc260f3395c5423f2583c1;hpb=c370a1f38215f6461cf4366e6885757e7aa2b96a;p=dcpomatic.git diff --git a/src/wx/video_waveform_dialog.cc b/src/wx/video_waveform_dialog.cc index 6b0ed4410..bc68fa6c2 100644 --- a/src/wx/video_waveform_dialog.cc +++ b/src/wx/video_waveform_dialog.cc @@ -22,13 +22,18 @@ #include "video_waveform_plot.h" #include "film_viewer.h" #include "wx_util.h" -#include +#include "static_text.h" +#include #include 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 film, weak_ptr viewer) : wxDialog ( @@ -56,22 +61,22 @@ VideoWaveformDialog::VideoWaveformDialog (wxWindow* parent, weak_ptr _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); - _x_position = new wxStaticText (this, wxID_ANY, ""); + 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); - _value = new wxStaticText (this, wxID_ANY, ""); + 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); overall_sizer->Add (position, 0, wxEXPAND | wxALL, DCPOMATIC_SIZER_Y_GAP);