summaryrefslogtreecommitdiff
path: root/src/wx/kdm_timing_panel.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2020-07-27 21:47:26 +0200
committerCarl Hetherington <cth@carlh.net>2020-07-27 21:47:26 +0200
commit2da4caba7871455c097c0ed940dd6f2332dbda5d (patch)
treef87883d0fcfe4c19ae5f7490306d49cc4f5d02b3 /src/wx/kdm_timing_panel.cc
parent94aadbd62c259a73d7511522dd167d519c68c5f9 (diff)
parent5d440e1133fc68dfffeaf53cf934b996dae811c7 (diff)
Merge branch 'warnings' into v2.15.x.
Clean up our handling of compiler warnings in a variety of ways, and use #pragma rather than -Wno to only disable warnings where necessary.
Diffstat (limited to 'src/wx/kdm_timing_panel.cc')
-rw-r--r--src/wx/kdm_timing_panel.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/wx/kdm_timing_panel.cc b/src/wx/kdm_timing_panel.cc
index 51a99627c..2734a9894 100644
--- a/src/wx/kdm_timing_panel.cc
+++ b/src/wx/kdm_timing_panel.cc
@@ -22,8 +22,11 @@
#include "wx_util.h"
#include "time_picker.h"
#include "static_text.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
#include <wx/datectrl.h>
#include <wx/dateevt.h>
+DCPOMATIC_ENABLE_WARNINGS
using std::cout;
using boost::bind;