From 5527bdb269e355ca95aa91fe3907bfef0ef17ff4 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_choice.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/wx/kdm_choice.cc') diff --git a/src/wx/kdm_choice.cc b/src/wx/kdm_choice.cc index c8685e22c..113ad51b5 100644 --- a/src/wx/kdm_choice.cc +++ b/src/wx/kdm_choice.cc @@ -20,15 +20,16 @@ #include "kdm_choice.h" +#include "wx_util.h" KDMChoice::KDMChoice (wxWindow* parent) : wxChoice (parent, wxID_ANY) { - Append("Modified Transitional 1", reinterpret_cast(dcp::Formulation::MODIFIED_TRANSITIONAL_1)); - Append("DCI Any", reinterpret_cast(dcp::Formulation::DCI_ANY)); - Append("DCI Specific", reinterpret_cast(dcp::Formulation::DCI_SPECIFIC)); - Append("Multiple Modified Transitional 1", reinterpret_cast(dcp::Formulation::MULTIPLE_MODIFIED_TRANSITIONAL_1)); + Append(char_to_wx("Modified Transitional 1"), reinterpret_cast(dcp::Formulation::MODIFIED_TRANSITIONAL_1)); + Append(char_to_wx("DCI Any"), reinterpret_cast(dcp::Formulation::DCI_ANY)); + Append(char_to_wx("DCI Specific"), reinterpret_cast(dcp::Formulation::DCI_SPECIFIC)); + Append(char_to_wx("Multiple Modified Transitional 1"), reinterpret_cast(dcp::Formulation::MULTIPLE_MODIFIED_TRANSITIONAL_1)); } -- cgit v1.2.3