X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fmarkers_dialog.h;h=e962d44631e9fc28193b3b06f567db5f26485579;hb=HEAD;hp=fbbaa1aee9fd2c12178d87ce6303c51b4a8b1a2a;hpb=8c365af343a15bee11af53fc6bc16487b83260d1;p=dcpomatic.git diff --git a/src/wx/markers_dialog.h b/src/wx/markers_dialog.h index fbbaa1aee..e962d4463 100644 --- a/src/wx/markers_dialog.h +++ b/src/wx/markers_dialog.h @@ -18,10 +18,14 @@ */ + +#include +LIBDCP_DISABLE_WARNINGS #include -#include -#include +LIBDCP_ENABLE_WARNINGS #include +#include + class Marker; class Film; @@ -30,9 +34,9 @@ class FilmViewer; class MarkersDialog : public wxDialog { public: - MarkersDialog (wxWindow* parent, boost::weak_ptr film, boost::weak_ptr viewer); + MarkersDialog (wxWindow* parent, std::weak_ptr film, FilmViewer const& viewer); private: - std::list > _markers; - boost::weak_ptr _film; + std::list> _markers; + std::weak_ptr _film; };