Fix lots of macOS warnings by using a different boost/bind include.

[dcpomatic.git] / src / wx / closed_captions_dialog.cc

diff --git a/src/wx/closed_captions_dialog.cc b/src/wx/closed_captions_dialog.cc
index 4519c4b7cdd4b0fbc1398d1f32fad7c6ed7341ca..7411fa15377fbcd3a96179477128d21ffa7b958d 100644 (file)
--- a/src/wx/closed_captions_dialog.cc
+++ b/src/wx/closed_captions_dialog.cc
@@ -25,7 +25,7 @@
 #include "lib/butler.h"
 #include "lib/text_content.h"
 #include "lib/compose.hpp"
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 using std::list;
 using std::max;
@@ -35,6 +35,9 @@ using std::make_pair;
 using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 using namespace dcpomatic;
 
 ClosedCaptionsDialog::ClosedCaptionsDialog (wxWindow* parent, FilmViewer* viewer)
@@ -55,12 +58,12 @@ ClosedCaptionsDialog::ClosedCaptionsDialog (wxWindow* parent, FilmViewer* viewer
        , _current_in_lines (false)
        , _timer (this)
 {
-       _lines.resize (CLOSED_CAPTION_LINES);
+       _lines.resize (MAX_CLOSED_CAPTION_LINES);
 
        wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
 
        wxBoxSizer* track_sizer = new wxBoxSizer (wxHORIZONTAL);
-       add_label_to_sizer (track_sizer, this, _("Track"), true);
+       add_label_to_sizer (track_sizer, this, _("Track"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
        track_sizer->Add (_track, 0, wxEXPAND | wxLEFT, DCPOMATIC_SIZER_X_GAP);
 
        sizer->Add (track_sizer, 0, wxALL, DCPOMATIC_SIZER_GAP);
@@ -101,16 +104,16 @@ ClosedCaptionsDialog::paint ()
        dc.SetTextForeground (*wxWHITE);
 
        /* Choose a font which fits vertically */
-       int const line_height = max (8, dc.GetSize().GetHeight() / CLOSED_CAPTION_LINES);
+       int const line_height = max (8, dc.GetSize().GetHeight() / MAX_CLOSED_CAPTION_LINES);
        wxFont font (*wxNORMAL_FONT);
        font.SetPixelSize (wxSize (0, line_height * 0.8));
        dc.SetFont (font);
 
-       for (int i = 0; i < CLOSED_CAPTION_LINES; ++i) {
-               wxString const good = _lines[i].Left (CLOSED_CAPTION_LENGTH);
+       for (int i = 0; i < MAX_CLOSED_CAPTION_LINES; ++i) {
+               wxString const good = _lines[i].Left (MAX_CLOSED_CAPTION_LENGTH);
                dc.DrawText (good, 8, line_height * i);
-               if (_lines[i].Length() > CLOSED_CAPTION_LENGTH) {
-                       wxString const bad = _lines[i].Right (_lines[i].Length() - CLOSED_CAPTION_LENGTH);
+               if (_lines[i].Length() > MAX_CLOSED_CAPTION_LENGTH) {
+                       wxString const bad = _lines[i].Right (_lines[i].Length() - MAX_CLOSED_CAPTION_LENGTH);
                        wxSize size = dc.GetTextExtent (good);
                        dc.SetTextForeground (*wxRED);
                        dc.DrawText (bad, 8 + size.GetWidth(), line_height * i);
@@ -155,7 +158,7 @@ ClosedCaptionsDialog::update ()
 
        if (_current && _current->period.to < time) {
                /* Current one has finished; clear out */
-               for (int j = 0; j < CLOSED_CAPTION_LINES; ++j) {
+               for (int j = 0; j < MAX_CLOSED_CAPTION_LINES; ++j) {
                        _lines[j] = "";
                }
                Refresh ();
@@ -189,7 +192,7 @@ ClosedCaptionsDialog::update ()
 
                list<StringText> to_show = _current->text.string;
 
-               for (int j = 0; j < CLOSED_CAPTION_LINES; ++j) {
+               for (int j = 0; j < MAX_CLOSED_CAPTION_LINES; ++j) {
                        _lines[j] = "";
                }
 
@@ -197,7 +200,7 @@ ClosedCaptionsDialog::update ()
 
                list<StringText>::const_iterator j = to_show.begin();
                int k = 0;
-               while (j != to_show.end() && k < CLOSED_CAPTION_LINES) {
+               while (j != to_show.end() && k < MAX_CLOSED_CAPTION_LINES) {
                        _lines[k] = j->text();
                        ++j;
                        ++k;
@@ -208,7 +211,7 @@ ClosedCaptionsDialog::update ()
        }
 
        if (!_current && _tracks.empty()) {
-               for (int i = 0; i < CLOSED_CAPTION_LINES; ++i) {
+               for (int i = 0; i < MAX_CLOSED_CAPTION_LINES; ++i) {
                        _lines[i] = wxString();
                }
        }