diff options
| -rw-r--r-- | src/tools/dcpomatic_verifier.cc | 4 | ||||
| -rw-r--r-- | src/wx/dir_dialog.cc | 8 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/tools/dcpomatic_verifier.cc b/src/tools/dcpomatic_verifier.cc index 78f4b94ff..d24100ff3 100644 --- a/src/tools/dcpomatic_verifier.cc +++ b/src/tools/dcpomatic_verifier.cc @@ -146,7 +146,11 @@ public: add_label_to_sizer(dcp_sizer, _overall_panel, _("DCPs"), true, 0, wxALIGN_CENTER_VERTICAL); auto add = [this](wxWindow* parent) { +#if wxCHECK_VERSION(3, 1, 4) DirDialog dialog(parent, _("Select DCP(s)"), wxDD_MULTIPLE, "AddVerifierInputPath"); +#else + DirDialog dialog(parent, _("Select DCP(s)"), 0, "AddVerifierInputPath"); +#endif if (dialog.show()) { wxProgressDialog progress(variant::wx::dcpomatic(), _("Examining DCPs")); diff --git a/src/wx/dir_dialog.cc b/src/wx/dir_dialog.cc index 869a86926..e5429fa77 100644 --- a/src/wx/dir_dialog.cc +++ b/src/wx/dir_dialog.cc @@ -68,7 +68,11 @@ vector<boost::filesystem::path> DirDialog::paths() const { wxArrayString wx; +#if wxCHECK_VERSION(3, 1, 4) GetPaths(wx); +#else + wx.Append(GetPath()); +#endif vector<boost::filesystem::path> std; for (size_t i = 0; i < wx.GetCount(); ++i) { @@ -90,7 +94,11 @@ DirDialog::show() return false; } +#if wxCHECK_VERSION(3, 1, 4) auto initial = GetWindowStyle() & wxDD_MULTIPLE ? paths()[0] : path(); +#else + auto initial = path(); +#endif Config::instance()->set_initial_path(_initial_path_key, initial.parent_path()); return true; } |