diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-08-09 02:02:20 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-09-03 17:02:24 +0200 |
| commit | 5527bdb269e355ca95aa91fe3907bfef0ef17ff4 (patch) | |
| tree | 5dd2fc2e81cf193c9712606f43f1e13e1a6e46bf /src/wx/content_menu.cc | |
| parent | a27964bd1794bb6a843873a0eaf3faa2c5cc317a (diff) | |
Remove some implicit conversions between wxString and std::string.
Diffstat (limited to 'src/wx/content_menu.cc')
| -rw-r--r-- | src/wx/content_menu.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc index fdf43ba7c..ddc155952 100644 --- a/src/wx/content_menu.cc +++ b/src/wx/content_menu.cc @@ -177,7 +177,7 @@ ContentMenu::popup (weak_ptr<Film> film, ContentList c, TimelineContentViewList auto item = _cpl_menu->AppendRadioItem ( id++, wxString::Format ( - "%s (%s)", + char_to_wx("%s (%s)"), std_to_wx(i->annotation_text().get_value_or("")).data(), std_to_wx(i->id()).data() ) @@ -427,7 +427,7 @@ ContentMenu::kdm () error_dialog (_parent, std_to_wx(e.summary()), std_to_wx(e.detail())); return; } catch (exception& e) { - error_dialog (_parent, e.what()); + error_dialog(_parent, std_to_wx(e.what())); return; } |