X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_menu.h;h=a38109b0738e84914139a38ca0350c47b6c54604;hb=c0a609b31bbf69d1fafcc734ac4f825933703d23;hp=43480888a5007ed306bc49f0468dd71fe1d01379;hpb=a3a38dcdab89d3c7fa21917ea7caec82d1586035;p=dcpomatic.git diff --git a/src/wx/content_menu.h b/src/wx/content_menu.h index 43480888a..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); @@ -55,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; @@ -66,8 +67,6 @@ private: wxMenuItem* _ov; wxMenuItem* _choose_cpl; wxMenuItem* _remove; - - boost::signals2::scoped_connection _job_connection; }; #endif