projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix Windows build.
[dcpomatic.git]
/
src
/
wx
/
time_picker.cc
diff --git
a/src/wx/time_picker.cc
b/src/wx/time_picker.cc
index 966671be9ac100f8c876707a4ad8b8ff038068b3..2bc3556fd237757d2dbd51de6a9132d0613be2b9 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 <dcp/locale_convert.h>
#include <dcp/locale_convert.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/spinctrl.h>
#include <wx/spinctrl.h>
+LIBDCP_ENABLE_WARNINGS
#include <boost/bind/bind.hpp>
#include <iomanip>
#include <boost/bind/bind.hpp>
#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;