X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_view.h;h=d7c1a43ed7b971307a5fc1b5810e07e7945c4fb4;hb=b915348a8288d68e2ff114fb3dd89ad22e699969;hp=471dd054bd95f81ab3ec29644a64c6a53ce465d4;hpb=620b7761a33d2e3641cd911bfe58e0fbb928c888;p=dcpomatic.git diff --git a/src/wx/content_view.h b/src/wx/content_view.h index 471dd054b..d7c1a43ed 100644 --- a/src/wx/content_view.h +++ b/src/wx/content_view.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2018 Carl Hetherington + Copyright (C) 2018-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,28 +18,32 @@ */ + +#include "lib/content_store.h" +#include "lib/warnings.h" +DCPOMATIC_DISABLE_WARNINGS #include -#include -#include +DCPOMATIC_ENABLE_WARNINGS #include + class Content; class Film; -class ContentView : public wxListCtrl + +class ContentView : public wxListCtrl, public ContentStore { public: - ContentView (wxWindow* parent, boost::weak_ptr film); + ContentView (wxWindow* parent); - boost::shared_ptr selected () const; + std::shared_ptr selected () const; void update (); - boost::shared_ptr get (std::string digest) const; - void set_film (boost::weak_ptr film); + std::shared_ptr get (std::string digest) const override; private: - void add (boost::shared_ptr content); + void add (std::shared_ptr content); - boost::weak_ptr _film; - std::vector > _content; + std::weak_ptr _film; + std::vector> _content; };