projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
wx
/
film_editor.h
diff --git
a/src/wx/film_editor.h
b/src/wx/film_editor.h
index a198d7aa7d0ce221b0e246a13b3bd24bdd6667d6..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"
#include <boost/signals2.hpp>
#include "lib/film.h"
-class wxNotebook;
class wxSpinCtrl;
class wxSpinCtrl;
+class wxNotebook;
class Film;
class Ratio;
class ContentPanel;
class Film;
class Ratio;
class ContentPanel;
@@
-54,7
+54,6
@@
public:
return _film;
}
return _film;
}
-private:
/* Handle changes to the model */
void film_changed (Film::Property);
void film_content_changed (int);
/* Handle changes to the model */
void film_changed (Film::Property);
void film_content_changed (int);