diff options
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/dcpomatic_combiner.cc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/tools/dcpomatic_combiner.cc b/src/tools/dcpomatic_combiner.cc index fb788ef6b..8e7337f65 100644 --- a/src/tools/dcpomatic_combiner.cc +++ b/src/tools/dcpomatic_combiner.cc @@ -19,6 +19,7 @@ */ +#include "wx/dir_dialog.h" #include "wx/dir_picker_ctrl.h" #include "wx/editable_list.h" #include "wx/wx_signal_manager.h" @@ -56,18 +57,23 @@ display_string (boost::filesystem::path p, int) } -class DirDialogWrapper : public wxDirDialog +class DirDialogWrapper : public DirDialog { public: DirDialogWrapper (wxWindow* parent) - : wxDirDialog (parent, _("Choose a DCP folder"), wxT(""), wxDD_DIR_MUST_EXIST) + : DirDialog (parent, _("Choose a DCP folder"), wxDD_DIR_MUST_EXIST, "AddCombinerInputPath") { } + virtual int ShowModal() override + { + return DirDialog::show() ? wxID_OK : wxID_CANCEL; + } + optional<boost::filesystem::path> get () const { - return boost::filesystem::path(wx_to_std(GetPath())); + return path(); } void set (boost::filesystem::path) |