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/tools/dcpomatic_server.cc | |
| parent | a27964bd1794bb6a843873a0eaf3faa2c5cc317a (diff) | |
Remove some implicit conversions between wxString and std::string.
Diffstat (limited to 'src/tools/dcpomatic_server.cc')
| -rw-r--r-- | src/tools/dcpomatic_server.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc index 5aad282fd..ef232a2a2 100644 --- a/src/tools/dcpomatic_server.cc +++ b/src/tools/dcpomatic_server.cc @@ -202,7 +202,7 @@ public: private: void appended (string s) { - (*_text) << s << "\n"; + (*_text) << std_to_wx(s) << char_to_wx("\n"); } void removed (int n) @@ -212,7 +212,7 @@ private: void update_state () { - _fps->SetLabel (wxString::Format ("%.1f", server_log->fps())); + _fps->SetLabel(wxString::Format(char_to_wx("%.1f"), server_log->fps())); } wxTextCtrl* _text; |