X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftext_view.h;h=b44742b6313afeeb524454f59577fbdc4e8f0700;hb=cf7b5fd94e50f740ab93f52343610d01c80ac6d5;hp=6ce22dc799dfa9f579b733a0a023faf2bc10a1f9;hpb=c4403784febdbdd42e9c32e67fadb147f11fe566;p=dcpomatic.git diff --git a/src/wx/text_view.h b/src/wx/text_view.h index 6ce22dc79..b44742b63 100644 --- a/src/wx/text_view.h +++ b/src/wx/text_view.h @@ -19,10 +19,11 @@ */ #include "lib/content_text.h" +#include "lib/warnings.h" +DCPOMATIC_DISABLE_WARNINGS #include +DCPOMATIC_ENABLE_WARNINGS #include -#include -#include class Decoder; class FilmViewer; @@ -33,11 +34,11 @@ class TextView : public wxDialog public: TextView ( wxWindow *, - boost::shared_ptr, - boost::shared_ptr content, - boost::shared_ptr caption, - boost::shared_ptr, - boost::weak_ptr viewer + std::shared_ptr, + std::shared_ptr content, + std::shared_ptr caption, + std::shared_ptr, + std::weak_ptr viewer ); private: @@ -50,6 +51,6 @@ private: boost::optional _frc; boost::optional _last_count; std::vector _start_times; - boost::weak_ptr _content; - boost::weak_ptr _film_viewer; + std::weak_ptr _content; + std::weak_ptr _film_viewer; };