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/wx/kdm_cpl_panel.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/wx/kdm_cpl_panel.cc') diff --git a/src/wx/kdm_cpl_panel.cc b/src/wx/kdm_cpl_panel.cc index 523d0c369..e07df105d 100644 --- a/src/wx/kdm_cpl_panel.cc +++ b/src/wx/kdm_cpl_panel.cc @@ -52,13 +52,13 @@ KDMCPLPanel::KDMCPLPanel (wxWindow* parent, vector cpls) /* CPL details */ auto table = new wxFlexGridSizer(2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); add_label_to_sizer (table, this, _("DCP directory"), true); - _dcp_directory = new StaticText (this, ""); + _dcp_directory = new StaticText(this, {}); table->Add (_dcp_directory); add_label_to_sizer (table, this, _("CPL ID"), true); - _cpl_id = new StaticText (this, ""); + _cpl_id = new StaticText(this, {}); table->Add (_cpl_id); add_label_to_sizer (table, this, _("CPL annotation text"), true); - _cpl_annotation_text = new StaticText (this, ""); + _cpl_annotation_text = new StaticText(this, {}); table->Add (_cpl_annotation_text); vertical->Add (table, 0, wxEXPAND | wxTOP, DCPOMATIC_SIZER_GAP + 2); @@ -104,7 +104,7 @@ KDMCPLPanel::update_cpl_summary () void KDMCPLPanel::cpl_browse_clicked () { - auto d = make_wx(this, _("Select CPL XML file"), wxEmptyString, wxEmptyString, "*.xml"); + auto d = make_wx(this, _("Select CPL XML file"), wxEmptyString, wxEmptyString, char_to_wx("*.xml")); if (d->ShowModal() == wxID_CANCEL) { return; } -- cgit v1.2.3