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/video_waveform_dialog.cc | |
| parent | a27964bd1794bb6a843873a0eaf3faa2c5cc317a (diff) | |
Remove some implicit conversions between wxString and std::string.
Diffstat (limited to 'src/wx/video_waveform_dialog.cc')
| -rw-r--r-- | src/wx/video_waveform_dialog.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/wx/video_waveform_dialog.cc b/src/wx/video_waveform_dialog.cc index 73ccc82df..0e3c6cf8c 100644 --- a/src/wx/video_waveform_dialog.cc +++ b/src/wx/video_waveform_dialog.cc @@ -72,11 +72,11 @@ VideoWaveformDialog::VideoWaveformDialog(wxWindow* parent, weak_ptr<const Film> wxBoxSizer* position = new wxBoxSizer (wxHORIZONTAL); add_label_to_sizer (position, this, _("Image X position"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); - _x_position = new StaticText (this, ""); + _x_position = new StaticText(this, {}); _x_position->SetMinSize (wxSize (64, -1)); position->Add (_x_position, 0, wxALL, DCPOMATIC_SIZER_X_GAP); add_label_to_sizer (position, this, _("component value"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); - _value = new StaticText (this, ""); + _value = new StaticText(this, {}); _value->SetMinSize (wxSize (64, -1)); position->Add (_value, 0, wxALL, DCPOMATIC_SIZER_X_GAP); overall_sizer->Add (position, 0, wxEXPAND | wxALL, DCPOMATIC_SIZER_Y_GAP); @@ -132,14 +132,14 @@ void VideoWaveformDialog::mouse_moved (int x1, int x2, int y1, int y2) { if (x1 != x2) { - _x_position->SetLabel (wxString::Format ("%d-%d", x1, x2)); + _x_position->SetLabel(wxString::Format(char_to_wx("%d-%d"), x1, x2)); } else { - _x_position->SetLabel (wxString::Format ("%d", x1)); + _x_position->SetLabel(wxString::Format(char_to_wx("%d"), x1)); } if (y1 != y2) { - _value->SetLabel (wxString::Format ("%d-%d", y1, y2)); + _value->SetLabel(wxString::Format(char_to_wx("%d-%d"), y1, y2)); } else { - _value->SetLabel (wxString::Format ("%d", y1)); + _value->SetLabel(wxString::Format(char_to_wx("%d"), y1)); } } |