summaryrefslogtreecommitdiff
path: root/src/tools/dcpomatic_editor.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_editor.cc
parenta27964bd1794bb6a843873a0eaf3faa2c5cc317a (diff)
Remove some implicit conversions between wxString and std::string.
Diffstat (limited to 'src/tools/dcpomatic_editor.cc')
-rw-r--r--src/tools/dcpomatic_editor.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/dcpomatic_editor.cc b/src/tools/dcpomatic_editor.cc
index 5293608c9..960d658ee 100644
--- a/src/tools/dcpomatic_editor.cc
+++ b/src/tools/dcpomatic_editor.cc
@@ -109,7 +109,7 @@ public:
_duration->SetRange(0, 259200);
_duration->SetValue(asset->duration().get_value_or(0));
- intrinsic_duration->SetValue(wxString::Format("%ld", asset->intrinsic_duration()));
+ intrinsic_duration->SetValue(wxString::Format(char_to_wx("%ld"), asset->intrinsic_duration()));
_annotation_text->Bind(wxEVT_TEXT, boost::bind(&AssetPanel::annotation_text_changed, this));
_entry_point->Bind(wxEVT_SPINCTRL, boost::bind(&AssetPanel::entry_point_changed, this));
@@ -543,7 +543,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()));
}
}