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/html_dialog.cc | |
| parent | a27964bd1794bb6a843873a0eaf3faa2c5cc317a (diff) | |
Remove some implicit conversions between wxString and std::string.
Diffstat (limited to 'src/wx/html_dialog.cc')
| -rw-r--r-- | src/wx/html_dialog.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/wx/html_dialog.cc b/src/wx/html_dialog.cc index 44b51bbe0..c139db72b 100644 --- a/src/wx/html_dialog.cc +++ b/src/wx/html_dialog.cc @@ -44,14 +44,14 @@ HTMLDialog::HTMLDialog (wxWindow* parent, wxString title, wxString html, bool ok /* Add some resources that are used by HTML passed into this dialog */ wxMemoryFSHandler::AddFile( - "me.jpg", + char_to_wx("me.jpg"), wxBitmap(bitmap_path("me.jpg"), wxBITMAP_TYPE_JPEG), wxBITMAP_TYPE_JPEG ); auto h = new wxHtmlWindow (this); if (gui_is_dark()) { - h->SetPage(wxString::Format("<body text=\"white\">%s</body>", html)); + h->SetPage(wxString::Format(char_to_wx("<body text=\"white\">%s</body>"), html)); h->SetHTMLBackgroundColour(wxColour(50, 50, 50)); } else { h->SetPage(html); @@ -81,7 +81,7 @@ HTMLDialog::HTMLDialog (wxWindow* parent, wxString title, wxString html, bool ok HTMLDialog::~HTMLDialog() { - wxMemoryFSHandler::RemoveFile("me.jpg"); + wxMemoryFSHandler::RemoveFile(char_to_wx("me.jpg")); } |