Revert "Remove join function; the code is long and I don't think anybody"

[dcpomatic.git] / src / wx / content_menu.h

diff --git a/src/wx/content_menu.h b/src/wx/content_menu.h
index 7b1e663fa8a86902746ca9c6e05d1b30b26a961a..a38109b0738e84914139a38ca0350c47b6c54604 100644 (file)
--- 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<Film>, ContentList, TimelineContentViewList, wxPoint);
 
@@ -50,13 +49,13 @@ private:
        void remove ();
        void maybe_found_missing (boost::weak_ptr<Job>, boost::weak_ptr<Content>, boost::weak_ptr<Content>);
        void cpl_selected (wxCommandEvent& ev);
-       void check_kdm_validity (boost::weak_ptr<DCPContent> wp);
 
        wxMenu* _menu;
        wxMenu* _cpl_menu;
        /** Film that we are working with; set up by popup() */
        boost::weak_ptr<Film> _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<boost::signals2::connection> _job_connections;
 };
 
 #endif