Merge master.

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

diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index 28baf410c6fe5f9d627de23fceaeee4d07fcc01c..25749fffaf10ec8d3120ee1f02a442fa31ecde11 100644 (file)
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -25,8 +25,8 @@
 #include <boost/signals2.hpp>
 #include "lib/film.h"
 
-class wxNotebook;
 class wxSpinCtrl;
+class wxNotebook;
 class Film;
 class Ratio;
 class ContentPanel;
@@ -38,7 +38,7 @@ class DCPPanel;
 class FilmEditor : public wxPanel
 {
 public:
-       FilmEditor (boost::shared_ptr<Film>, wxWindow *);
+       FilmEditor (wxWindow *);
 
        void set_film (boost::shared_ptr<Film>);
 
@@ -54,7 +54,6 @@ public:
                return _film;
        }
 
-private:
        /* Handle changes to the model */
        void film_changed (Film::Property);
        void film_content_changed (int);