X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fmarkers_dialog.h;h=7d713bd59fbf4f60ff723c1399de7b333b7877c7;hb=bb5acc8b8d783a4133b0b10285937d9151dc57c9;hp=e2c261873959074522a02a6356794beb0495388c;hpb=2da4caba7871455c097c0ed940dd6f2332dbda5d;p=dcpomatic.git diff --git a/src/wx/markers_dialog.h b/src/wx/markers_dialog.h index e2c261873..7d713bd59 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 DCPOMATIC_ENABLE_WARNINGS -#include -#include #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; };