summaryrefslogtreecommitdiff
path: root/src/tools/dcpomatic.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2024-08-09 02:02:20 +0200
committerCarl Hetherington <cth@carlh.net>2024-09-03 17:02:24 +0200
commit5527bdb269e355ca95aa91fe3907bfef0ef17ff4 (patch)
tree5dd2fc2e81cf193c9712606f43f1e13e1a6e46bf /src/tools/dcpomatic.cc
parenta27964bd1794bb6a843873a0eaf3faa2c5cc317a (diff)
Remove some implicit conversions between wxString and std::string.
Diffstat (limited to 'src/tools/dcpomatic.cc')
-rw-r--r--src/tools/dcpomatic.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 5e56a2672..a2e44280c 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -575,7 +575,7 @@ private:
}
}
wxString message = _("Could not create folder to store film.");
- message += " ";
+ message += char_to_wx(" ");
if (!found_bad_chars.empty()) {
message += wxString::Format (_("Try removing the %s characters from your folder name."), std_to_wx(found_bad_chars).data());
} else {
@@ -1015,7 +1015,7 @@ private:
} catch (dcp::NotEncryptedError& e) {
error_dialog (this, _("CPL's content is not encrypted."));
} catch (exception& e) {
- error_dialog (this, e.what ());
+ error_dialog(this, std_to_wx(e.what()));
} catch (...) {
error_dialog (this, _("An unknown exception occurred."));
}
@@ -1845,7 +1845,7 @@ private:
)
);
} catch (...) {
- error_dialog(nullptr, _("An unknown exception occurred.") + " " + wx::report_problem());
+ error_dialog(nullptr, wxString::Format(_("An unknown exception occurred. %s"), wx::report_problem()));
}
}