Fix assertion with wxWidgets 3.1.

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

diff --git a/src/wx/content_menu.h b/src/wx/content_menu.h
index 43480888a5007ed306bc49f0468dd71fe1d01379..756c1675a7c111a9c6120023142aea168a2425aa 100644 (file)
--- 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<Film>, ContentList, TimelineContentViewList, wxPoint);
 
@@ -43,9 +43,11 @@ private:
        void join ();
        void find_missing ();
        void properties ();
+       void advanced ();
        void re_examine ();
        void kdm ();
        void ov ();
+       void set_dcp_settings ();
        void remove ();
        void maybe_found_missing (boost::weak_ptr<Job>, boost::weak_ptr<Content>, boost::weak_ptr<Content>);
        void cpl_selected (wxCommandEvent& ev);
@@ -55,19 +57,20 @@ private:
        /** 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;
        wxMenuItem* _join;
        wxMenuItem* _find_missing;
        wxMenuItem* _properties;
+       wxMenuItem* _advanced;
        wxMenuItem* _re_examine;
        wxMenuItem* _kdm;
        wxMenuItem* _ov;
        wxMenuItem* _choose_cpl;
+       wxMenuItem* _set_dcp_settings;
        wxMenuItem* _remove;
-
-       boost::signals2::scoped_connection _job_connection;
 };
 
 #endif