projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Just call it the Combiner not the DCP Combiner.
[dcpomatic.git]
/
src
/
wx
/
wx_signal_manager.cc
diff --git
a/src/wx/wx_signal_manager.cc
b/src/wx/wx_signal_manager.cc
index 95e71cbc0ee99d8b275ad5b6b121b4196d8be93b..d26ddd4a03cf53151372135597c6f686bd87c2c1 100644
(file)
--- a/
src/wx/wx_signal_manager.cc
+++ b/
src/wx/wx_signal_manager.cc
@@
-18,8
+18,13
@@
*/
-#include <wx/wx.h>
+
#include "wx_signal_manager.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
+
wxSignalManager::wxSignalManager (wxEvtHandler* h)
: _handler (h)