projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Disable warnings around all wx includes.
[dcpomatic.git]
/
src
/
wx
/
screens_panel.h
diff --git
a/src/wx/screens_panel.h
b/src/wx/screens_panel.h
index 9c9811c1d0de7fa83d224896216b514410a7364c..f19aef68000ac08b34526945ee1851c18fe7f9c8 100644
(file)
--- a/
src/wx/screens_panel.h
+++ b/
src/wx/screens_panel.h
@@
-21,10
+21,10
@@
#include "lib/warnings.h"
DCPOMATIC_DISABLE_WARNINGS
#include "lib/warnings.h"
DCPOMATIC_DISABLE_WARNINGS
-#include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
#include <wx/srchctrl.h>
#include <wx/treelist.h>
#include <wx/srchctrl.h>
#include <wx/treelist.h>
+#include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
#include <boost/signals2.hpp>
#include <list>
#include <map>
#include <boost/signals2.hpp>
#include <list>
#include <map>
@@
-37,7
+37,7
@@
namespace dcpomatic {
class Cinema;
class Cinema;
-
class
UCollator;
+
struct
UCollator;
class ScreensPanel : public wxPanel
class ScreensPanel : public wxPanel