X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_editor.h;h=296058c212e55ee7496ec589e53ac2eaca51e4d0;hb=93664a46e226aad6cfb71749e3a83904102ea896;hp=6aff127d8a6cfe4156a478e8a971220aad133fae;hpb=8963f0007af1a312017b9627c18b82ec2a577591;p=dcpomatic.git

diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index 6aff127d8..296058c21 100644
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -25,10 +25,10 @@
 
 
 #include "lib/film.h"
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
 
@@ -45,12 +45,11 @@ class FilmViewer;
 class FilmEditor : public wxPanel
 {
 public:
-	FilmEditor (wxWindow *, std::weak_ptr<FilmViewer> viewer);
+	FilmEditor(wxWindow *, FilmViewer& viewer);
 
 	void set_film (std::shared_ptr<Film>);
 	void first_shown ();
 
-	boost::signals2::signal<void (boost::filesystem::path)> FileChanged;
 	boost::signals2::signal<void (void)> SelectionChanged;
 
 	/* Stuff for panels */
@@ -72,7 +71,6 @@ private:
 	void set_general_sensitivity (bool);
 	void active_jobs_changed (boost::optional<std::string>);
 
-	wxNotebook* _main_notebook;
 	ContentPanel* _content_panel;
 	DCPPanel* _dcp_panel;