Use ScopeGuard for _no_check_selection

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

diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index 6aff127d8a6cfe4156a478e8a971220aad133fae..296058c212e55ee7496ec589e53ac2eaca51e4d0 100644 (file)
--- 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;