projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump libsub for SSA Margin{L,R} support (#2811).
[dcpomatic.git]
/
src
/
wx
/
templates_dialog.h
diff --git
a/src/wx/templates_dialog.h
b/src/wx/templates_dialog.h
index 8ef0d956ccf78099fa70f5e3782d2c6ead0d00c7..e3568a08c14de671198afeb17cc4656ccc4f163e 100644
(file)
--- a/
src/wx/templates_dialog.h
+++ b/
src/wx/templates_dialog.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2016
-2021
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,10
+18,15
@@
*/
*/
-#include <wx/wx.h>
+
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/listctrl.h>
#include <wx/listctrl.h>
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
#include <boost/signals2.hpp>
#include <boost/signals2.hpp>
+
class TemplatesDialog : public wxDialog
{
public:
class TemplatesDialog : public wxDialog
{
public: