Cleanup: tidying.

diff --git a/src/wx/kdm_output_panel.h b/src/wx/kdm_output_panel.h
index 1f7373165c4e459da7dc06c21d4f5d069a3442dd..f831fdce0937a44237d3df6f2ba565b2210da690 100644 (file)
--- a/src/wx/kdm_output_panel.h
+++ b/src/wx/kdm_output_panel.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2015-2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2022 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,19 +18,19 @@
 
 */
 
+
 #include "lib/kdm_with_metadata.h"
-#include "wx_util.h"
-#include "name_format_editor.h"
 #include <dcp/types.h>
 #include <wx/wx.h>
 #include <boost/filesystem.hpp>
 
-class wxRadioButton;
-class wxDirPickerCtrl;
+
 class DirPickerCtrl;
-class KDMTimingPanel;
 class Job;
-class Log;
+class NameFormatEditor;
+class wxDirPickerCtrl;
+class wxRadioButton;
+
 
 class KDMOutputPanel : public wxPanel
 {
@@ -52,7 +52,7 @@ public:
        }
 
        std::pair<std::shared_ptr<Job>, int> make (
-               std::list<KDMWithMetadataPtr > screen_kdms,
+               std::list<KDMWithMetadataPtr> screen_kdms,
                std::string name,
                std::function<bool (boost::filesystem::path)> confirm_overwrite
                );

diff --git a/src/wx/wx_util.h b/src/wx/wx_util.h
index 5057ad4238f83e6fdeb5eb5d8b43d6faa2161b0c..c975dba4bcffc4f612e8e662c5c57d0411fc84f0 100644 (file)
--- a/src/wx/wx_util.h
+++ b/src/wx/wx_util.h
@@ -159,7 +159,7 @@ extern int wx_get (wxChoice* widget);
 extern int wx_get (wxSpinCtrl* widget);
 extern double wx_get (wxSpinCtrlDouble* widget);
 
-#if defined(__WXMSW__)
+#ifdef DCPOMATIC_WINDOWS
 #define DCPOMATIC_USE_OWN_PICKER
 #endif