X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_menu.h;h=8a3548419aac8d7a9f5067b4a834004fb772f6b8;hb=68dfd11399fa0da4c36c0379402b526cada9b3ba;hp=ecbb4a3504e2e7a27e80e0c2c5777d48a945e594;hpb=9981fe99124d50239c90d26ed9251a7eaf4f21d9;p=dcpomatic.git diff --git a/src/wx/content_menu.h b/src/wx/content_menu.h index ecbb4a350..8a3548419 100644 --- a/src/wx/content_menu.h +++ b/src/wx/content_menu.h @@ -24,47 +24,54 @@ #include "timeline_content_view.h" #include "lib/types.h" #include -#include -#include +#include class Film; class Job; class DCPContent; -class ContentMenu : public boost::noncopyable +class ContentMenu { public: - ContentMenu (wxWindow* p); + explicit ContentMenu (wxWindow* p); - void popup (boost::weak_ptr, ContentList, TimelineContentViewList, wxPoint); + ContentMenu (ContentMenu const &) = delete; + ContentMenu& operator= (ContentMenu const &) = delete; + + void popup (std::weak_ptr, ContentList, TimelineContentViewList, wxPoint); private: void repeat (); void join (); void find_missing (); void properties (); + void advanced (); void re_examine (); void kdm (); void ov (); + void set_dcp_settings (); void remove (); - void maybe_found_missing (boost::weak_ptr, boost::weak_ptr, boost::weak_ptr); + void maybe_found_missing (std::weak_ptr, std::weak_ptr, std::weak_ptr); void cpl_selected (wxCommandEvent& ev); wxMenu* _menu; wxMenu* _cpl_menu; /** Film that we are working with; set up by popup() */ - boost::weak_ptr _film; + std::weak_ptr _film; wxWindow* _parent; + bool _pop_up_open; ContentList _content; TimelineContentViewList _views; wxMenuItem* _repeat; wxMenuItem* _join; wxMenuItem* _find_missing; wxMenuItem* _properties; + wxMenuItem* _advanced; wxMenuItem* _re_examine; wxMenuItem* _kdm; wxMenuItem* _ov; wxMenuItem* _choose_cpl; + wxMenuItem* _set_dcp_settings; wxMenuItem* _remove; };