Fix alignment of labels on macOS (#2043).

[dcpomatic.git] / src / wx / simple_video_view.h

diff --git a/src/wx/simple_video_view.h b/src/wx/simple_video_view.h
index 643c782b80d554fa441c391ff40315c7fcbc38e3..31756b5d85eceecbe62a693a5ed524adeb6edf5f 100644 (file)
--- a/src/wx/simple_video_view.h
+++ b/src/wx/simple_video_view.h
@@ -20,8 +20,11 @@
 
 #include "video_view.h"
 #include "lib/position.h"
+#include "lib/warnings.h"
 #include <dcp/types.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 class FilmViewer;
 
@@ -36,10 +39,10 @@ public:
 
        void update ();
        void start ();
-       bool display_next_frame (bool non_blocking);
+       NextFrameResult display_next_frame (bool non_blocking);
 
 private:
-       void set_image (boost::shared_ptr<const Image> image) {
+       void set_image (std::shared_ptr<const Image> image) {
                _image = image;
        }
 
@@ -48,7 +51,7 @@ private:
        void timer ();
 
        wxPanel* _panel;
-       boost::shared_ptr<const Image> _image;
+       std::shared_ptr<const Image> _image;
        wxTimer _timer;
        Position<int> _inter_position;
        dcp::Size _inter_size;