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
/
time_picker.cc
diff --git
a/src/wx/time_picker.cc
b/src/wx/time_picker.cc
index 6b37d864b2592c35d12b013c0173c75ec94448db..2bc3556fd237757d2dbd51de6a9132d0613be2b9 100644
(file)
--- a/
src/wx/time_picker.cc
+++ b/
src/wx/time_picker.cc
@@
-23,7
+23,10
@@
#include "time_picker.h"
#include "wx_util.h"
#include <dcp/locale_convert.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/spinctrl.h>
+LIBDCP_ENABLE_WARNINGS
#include <boost/bind/bind.hpp>
#include <iomanip>