X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_menu.h;h=a38109b0738e84914139a38ca0350c47b6c54604;hb=e6c828cbd577239e7c8e4c532161084a33843a0f;hp=7b1e663fa8a86902746ca9c6e05d1b30b26a961a;hpb=b55c6c5496f6c8248dd51bbcaecb80ef0efcbadb;p=dcpomatic.git diff --git a/src/wx/content_menu.h b/src/wx/content_menu.h index 7b1e663fa..a38109b07 100644 --- a/src/wx/content_menu.h +++ b/src/wx/content_menu.h @@ -34,8 +34,7 @@ class DCPContent; class ContentMenu : public boost::noncopyable { public: - ContentMenu (wxWindow* p); - ~ContentMenu (); + explicit ContentMenu (wxWindow* p); void popup (boost::weak_ptr, ContentList, TimelineContentViewList, wxPoint); @@ -50,13 +49,13 @@ private: void remove (); void maybe_found_missing (boost::weak_ptr, boost::weak_ptr, boost::weak_ptr); void cpl_selected (wxCommandEvent& ev); - void check_kdm_validity (boost::weak_ptr wp); 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; @@ -68,8 +67,6 @@ private: wxMenuItem* _ov; wxMenuItem* _choose_cpl; wxMenuItem* _remove; - - std::list _job_connections; }; #endif