diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-07-27 21:47:26 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-07-27 21:47:26 +0200 |
| commit | 2da4caba7871455c097c0ed940dd6f2332dbda5d (patch) | |
| tree | f87883d0fcfe4c19ae5f7490306d49cc4f5d02b3 /src/wx/self_dkdm_dialog.cc | |
| parent | 94aadbd62c259a73d7511522dd167d519c68c5f9 (diff) | |
| parent | 5d440e1133fc68dfffeaf53cf934b996dae811c7 (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/self_dkdm_dialog.cc')
| -rw-r--r-- | src/wx/self_dkdm_dialog.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/wx/self_dkdm_dialog.cc b/src/wx/self_dkdm_dialog.cc index 5eae05de4..4c10c8f6b 100644 --- a/src/wx/self_dkdm_dialog.cc +++ b/src/wx/self_dkdm_dialog.cc @@ -26,15 +26,20 @@ #include "lib/film.h" #include "lib/screen.h" #include "lib/config.h" +#include "lib/warnings.h" #include <libcxml/cxml.h> #ifdef DCPOMATIC_USE_OWN_PICKER #include "dir_picker_ctrl.h" #else +DCPOMATIC_DISABLE_WARNINGS #include <wx/filepicker.h> +DCPOMATIC_ENABLE_WARNINGS #endif +DCPOMATIC_DISABLE_WARNINGS #include <wx/treectrl.h> #include <wx/listctrl.h> #include <wx/stdpaths.h> +DCPOMATIC_ENABLE_WARNINGS #include <iostream> using std::string; |