X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_menu.h;h=a38109b0738e84914139a38ca0350c47b6c54604;hb=c6871fe8617b3de03662b7630355059393bf8043;hp=9aaf9d59fc075beb7eb476ac2aa50cd19f393618;hpb=df28b0e939bd0f12ae31e6f7ba94fa954496b3b8;p=dcpomatic.git diff --git a/src/wx/content_menu.h b/src/wx/content_menu.h index 9aaf9d59f..a38109b07 100644 --- a/src/wx/content_menu.h +++ b/src/wx/content_menu.h @@ -29,12 +29,12 @@ class Film; class Job; +class DCPContent; class ContentMenu : public boost::noncopyable { public: - ContentMenu (wxWindow* p); - ~ContentMenu (); + explicit ContentMenu (wxWindow* p); void popup (boost::weak_ptr, ContentList, TimelineContentViewList, wxPoint); @@ -48,11 +48,14 @@ private: void ov (); void remove (); void maybe_found_missing (boost::weak_ptr, boost::weak_ptr, boost::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; wxWindow* _parent; + bool _pop_up_open; ContentList _content; TimelineContentViewList _views; wxMenuItem* _repeat; @@ -62,9 +65,8 @@ private: wxMenuItem* _re_examine; wxMenuItem* _kdm; wxMenuItem* _ov; + wxMenuItem* _choose_cpl; wxMenuItem* _remove; - - boost::signals2::scoped_connection _job_connection; }; #endif