diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-03-05 11:15:59 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-03-15 09:31:09 +0100 |
| commit | f90bd4d97be25b3bca6b4523864896f5ff7b7e53 (patch) | |
| tree | 8f9f3d69ac415bc1c89e778e6fc717bbe819a20d | |
| parent | d56668322e5fc81904d94466da9e60e296006eb5 (diff) | |
Cleanup: tidying.
| -rw-r--r-- | src/wx/kdm_output_panel.cc | 2 | ||||
| -rw-r--r-- | src/wx/kdm_output_panel.h | 16 | ||||
| -rw-r--r-- | src/wx/wx_util.h | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/wx/kdm_output_panel.cc b/src/wx/kdm_output_panel.cc index 11f921aad..63618add6 100644 --- a/src/wx/kdm_output_panel.cc +++ b/src/wx/kdm_output_panel.cc @@ -118,7 +118,7 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent) _folder = new wxDirPickerCtrl (this, wxID_ANY, wxEmptyString, wxDirSelectorPromptStr, wxDefaultPosition, wxSize (300, -1)); #endif - auto path = Config::instance()->default_kdm_directory (); + auto path = Config::instance()->default_kdm_directory(); if (path) { _folder->SetPath (std_to_wx (path->string ())); } else { diff --git a/src/wx/kdm_output_panel.h b/src/wx/kdm_output_panel.h index 1f7373165..f831fdce0 100644 --- 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 e9be16b4f..f85110eae 100644 --- 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 |