From: Eduardo DAVILA <davila@creatis.insa-lyon.fr>
Date: Wed, 23 Nov 2022 09:54:52 +0000 (+0100)
Subject: #3393 bug with  std2wx
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;ds=sidebyside;h=5b6731daa92c6c8165edd7b31229c50ef5cafee1;p=crea.git

#3393 bug with  std2wx
---

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);