projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hide warnings triggered by Ubuntu 20.04's gcc.
[dcpomatic.git]
/
src
/
wx
/
film_editor.h
diff --git
a/src/wx/film_editor.h
b/src/wx/film_editor.h
index cbc8f92bee0b0b64245e706c0ed5d33ce1d28af2..84a1d361b7e3af37afec1085930a7e5b5156fdd6 100644
(file)
--- a/
src/wx/film_editor.h
+++ b/
src/wx/film_editor.h
@@
-23,7
+23,10
@@
*/
#include "lib/film.h"
*/
#include "lib/film.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
#include <wx/wx.h>
#include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
#include <boost/signals2.hpp>
class wxNotebook;
#include <boost/signals2.hpp>
class wxNotebook;
@@
-38,7
+41,7
@@
class FilmViewer;
class FilmEditor : public wxPanel
{
public:
class FilmEditor : public wxPanel
{
public:
- FilmEditor (wxWindow *,
FilmViewer*
viewer);
+ FilmEditor (wxWindow *,
boost::weak_ptr<FilmViewer>
viewer);
void set_film (boost::shared_ptr<Film>);
void set_film (boost::shared_ptr<Film>);