From 5b6731daa92c6c8165edd7b31229c50ef5cafee1 Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Wed, 23 Nov 2022 10:54:52 +0100 Subject: [PATCH] #3393 bug with std2wx --- src/creaWx.h | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/creaWx.h b/src/creaWx.h index 4a5e5f4..1447201 100644 --- a/src/creaWx.h +++ b/src/creaWx.h @@ -89,7 +89,10 @@ namespace crea { //================================================================== /// Conversion std::string to wxString - inline wxString std2wx(const std::string& s) { + inline wxString std2wx(const std::string& s) + { + +/* wxString wx; const char* my_string=s.c_str(); wxMBConvUTF8 *wxconv= new wxMBConvUTF8(); @@ -97,7 +100,12 @@ namespace crea delete wxconv; // test if conversion works of not. In case it fails convert from Ascii if(wx.length()==0) - wx=wxString(wxString::FromAscii(s.c_str())); + { + wx = wxString(wxString::FromAscii(s.c_str())); + } + */ + // EED 2022-10-27 + wxString wx( s.c_str() , wxConvUTF8); return wx; } //================================================================== @@ -106,7 +114,8 @@ namespace crea /// Conversion wxString to std::string inline std::string wx2std(const wxString& s){ std::string s2; - if(s.wxString::IsAscii()) { + if(s.wxString::IsAscii()) + { s2=s.wxString::ToAscii(); } else { const wxWX2MBbuf tmp_buf = wxConvCurrent->cWX2MB(s); -- 2.45.1