Merge master.

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

diff --git a/src/wx/content_menu.h b/src/wx/content_menu.h
index 2a672532001ca0ddaebcec1f41c04d4d03a599b8..f2ad3aa75621ac04a114b46badd931b6bd92a4b1 100644 (file)
--- a/src/wx/content_menu.h
+++ b/src/wx/content_menu.h
@@ -30,22 +30,25 @@ class Film;
 class ContentMenu
 {
 public:
-       ContentMenu (boost::shared_ptr<Film>, wxWindow *);
+       ContentMenu (wxWindow* p);
        ~ContentMenu ();
-
-       void popup (ContentList, wxPoint);
+       
+       void popup (boost::weak_ptr<Film>, ContentList, wxPoint);
 
 private:
        void repeat ();
+       void join ();
        void find_missing ();
        void remove ();
        void maybe_found_missing (boost::weak_ptr<Job>, boost::weak_ptr<Content>, boost::weak_ptr<Content>);
        
        wxMenu* _menu;
+       /** Film that we are working with; set up by popup() */
        boost::weak_ptr<Film> _film;
        wxWindow* _parent;
        ContentList _content;
        wxMenuItem* _repeat;
+       wxMenuItem* _join;
        wxMenuItem* _find_missing;
        wxMenuItem* _remove;
 };