Fix assertion with wxWidgets 3.1.

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

diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index 48e944fc6a7c020643d568bc76f8745f11dbe435..0382ef9d448463eeccde68ea3e7802d910ac95a9 100644 (file)
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -23,14 +23,17 @@
  */
 
 #include "lib/film.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
 class wxNotebook;
 class Film;
 class ContentPanel;
 class DCPPanel;
-class ControlFilmViewer;
+class FilmViewer;
 
 /** @class FilmEditor
  *  @brief A wx widget to edit a film's metadata, and perform various functions.
@@ -38,9 +41,10 @@ class ControlFilmViewer;
 class FilmEditor : public wxPanel
 {
 public:
-       FilmEditor (wxWindow *, ControlFilmViewer* viewer);
+       FilmEditor (wxWindow *, boost::weak_ptr<FilmViewer> viewer);
 
        void set_film (boost::shared_ptr<Film>);
+       void first_shown ();
 
        boost::signals2::signal<void (boost::filesystem::path)> FileChanged;
        boost::signals2::signal<void (void)> SelectionChanged;
@@ -55,6 +59,8 @@ public:
                return _film;
        }
 
+private:
+
        /* Handle changes to the model */
        void film_change (ChangeType, Film::Property);
        void film_content_change (ChangeType type, int);