From 203ee8d5dcb58a3acb79780afb95c5251d8e4311 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 9 Aug 2024 02:02:20 +0200 Subject: Remove some implicit conversions between wxString and std::string. --- src/tools/dcpomatic_kdm.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/tools/dcpomatic_kdm.cc') diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc index af16f57aa..909c4e281 100644 --- a/src/tools/dcpomatic_kdm.cc +++ b/src/tools/dcpomatic_kdm.cc @@ -698,7 +698,7 @@ private: if (!base->parent()) { /* This is the root group */ - _dkdm_id[_dkdm->AddRoot("root")] = base; + _dkdm_id[_dkdm->AddRoot(char_to_wx("root"))] = base; } else { /* Add base to the view */ wxTreeItemId added; @@ -944,7 +944,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())); } /* This will terminate the program */ @@ -953,7 +953,7 @@ private: void OnUnhandledException () override { - error_dialog(nullptr, _("An unknown exception occurred.") + " " + wx::report_problem()); + error_dialog(nullptr, wxString::Format(_("An unknown exception occurred. %s"), wx::report_problem())); } void idle () -- cgit v1.2.3