X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fmarkers_dialog.h;h=22af7126e29d348d1559b6cb3bd38a02020e8809;hb=3c29aa6531a4046a8db72dcac81189eb8893233c;hp=e2c261873959074522a02a6356794beb0495388c;hpb=c622a06189181a3a6ad356094c9a3cf4e1f5a722;p=dcpomatic.git diff --git a/src/wx/markers_dialog.h b/src/wx/markers_dialog.h index e2c261873..22af7126e 100644 --- a/src/wx/markers_dialog.h +++ b/src/wx/markers_dialog.h @@ -18,13 +18,14 @@ */ -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS + +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS -#include -#include +LIBDCP_ENABLE_WARNINGS #include +#include + class Marker; class Film; @@ -33,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, std::weak_ptr viewer); private: - std::list > _markers; - boost::weak_ptr _film; + std::list> _markers; + std::weak_ptr _film; };