X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_menu.h;h=a38109b0738e84914139a38ca0350c47b6c54604;hb=aa4fa753e93e0b4b8e48fe3ff2874c02c61397a5;hp=84daa71a56e0cd13a749471699d79ab5e0f27e1d;hpb=894d6e4cbfab5217adf6f39b1c097cec2a8f948c;p=dcpomatic.git diff --git a/src/wx/content_menu.h b/src/wx/content_menu.h index 84daa71a5..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); @@ -56,6 +55,7 @@ private: /** 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; @@ -67,8 +67,6 @@ private: wxMenuItem* _ov; wxMenuItem* _choose_cpl; wxMenuItem* _remove; - - std::list _job_connections; }; #endif