X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_editor.h;h=0e61f4898f7577dbcae7871b7ac0c18ba7850544;hb=563fc75855b9649cf135cf137cc1b0c43ebc8286;hp=576cd5ba1b251bab083dec3cab431049bda02ca4;hpb=d26296467bbf6bd1b2300dd862ce55fcd7f3d624;p=dcpomatic.git

diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index 576cd5ba1..0e61f4898 100644
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -23,7 +23,10 @@
  */
 
 #include "lib/film.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
 class wxNotebook;
@@ -38,9 +41,10 @@ class FilmViewer;
 class FilmEditor : public wxPanel
 {
 public:
-	FilmEditor (wxWindow *, FilmViewer* 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;
@@ -56,8 +60,8 @@ public:
 	}
 
 	/* Handle changes to the model */
-	void film_changed (Film::Property);
-	void film_content_changed (int);
+	void film_change (ChangeType, Film::Property);
+	void film_content_change (ChangeType type, int);
 
 	void set_general_sensitivity (bool);
 	void active_jobs_changed (boost::optional<std::string>);