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/kdm_output_panel.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/kdm_output_panel.cc')
| -rw-r--r-- | src/wx/kdm_output_panel.cc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/wx/kdm_output_panel.cc b/src/wx/kdm_output_panel.cc index a345d0e96..b138e7d31 100644 --- a/src/wx/kdm_output_panel.cc +++ b/src/wx/kdm_output_panel.cc @@ -18,9 +18,6 @@ */ -#include "lib/config.h" -#include "lib/cinema.h" -#include "lib/send_kdm_email_job.h" #include "kdm_output_panel.h" #include "kdm_timing_panel.h" #include "confirm_kdm_email_dialog.h" @@ -29,14 +26,22 @@ #include "name_format_editor.h" #include "check_box.h" #include "dcpomatic_button.h" +#include "lib/config.h" +#include "lib/cinema.h" +#include "lib/send_kdm_email_job.h" +#include "lib/warnings.h" #include <dcp/exceptions.h> #include <dcp/types.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/stdpaths.h> +DCPOMATIC_ENABLE_WARNINGS using std::pair; using std::string; |