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
/
time_picker.cc
diff --git
a/src/wx/time_picker.cc
b/src/wx/time_picker.cc
index 0d9668d7bf2c5114264345d049efbf264ba0ad39..614ea94240f9a0b56d58d6082dac8fe847dcb240 100644
(file)
--- a/
src/wx/time_picker.cc
+++ b/
src/wx/time_picker.cc
@@
-18,20
+18,25
@@
*/
*/
+
+#include "static_text.h"
#include "time_picker.h"
#include "wx_util.h"
#include "time_picker.h"
#include "wx_util.h"
-#include "
static_text
.h"
+#include "
lib/warnings
.h"
#include <dcp/locale_convert.h>
#include <dcp/locale_convert.h>
+DCPOMATIC_DISABLE_WARNINGS
#include <wx/spinctrl.h>
#include <wx/spinctrl.h>
-#include <boost/bind.hpp>
+DCPOMATIC_ENABLE_WARNINGS
+#include <boost/bind/bind.hpp>
#include <iomanip>
#include <iomanip>
+
+using std::cout;
+using std::max;
+using std::min;
using std::setfill;
using std::setw;
using std::setfill;
using std::setw;
-using std::min;
-using std::max;
using std::string;
using std::string;
-using std::cout;
using boost::bind;
using dcp::locale_convert;
using boost::bind;
using dcp::locale_convert;