X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_menu.h;h=8a3548419aac8d7a9f5067b4a834004fb772f6b8;hb=dddc0771d9d4896f84d8a23d66c9c643e02950fa;hp=0647331038b64d00477ca0e293abcf793d81a864;hpb=18404f99863131437497329f5a3b0c5180b060ae;p=dcpomatic.git diff --git a/src/wx/content_menu.h b/src/wx/content_menu.h index 064733103..8a3548419 100644 --- a/src/wx/content_menu.h +++ b/src/wx/content_menu.h @@ -24,36 +24,40 @@ #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; @@ -62,10 +66,12 @@ private: 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; };