X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaWx.h;h=1447201cd493d23a9b65368788ef3df09e5a3f8d;hb=d4027bac727722427de86e53e45fbbeddba767cf;hp=c97e10fb0dc35f66f337668c925a447072924ee3;hpb=ca800a1a9a78f119d37d9642ea29acb7c9b9a323;p=crea.git

diff --git a/src/creaWx.h b/src/creaWx.h
index c97e10f..1447201 100644
--- a/src/creaWx.h
+++ b/src/creaWx.h
@@ -66,11 +66,15 @@ typedef void wxWindow;
 //  (cout's to the console are visible) and has a wxWidgets GUI, 
 //  you need to use the linker option "/subsystem:console" and the following code:
 
+//2018-07-06 mingw64								\
+//    return WinMain(::GetModuleHandle(NULL), NULL, ::GetCommandLine() , SW_SHOWNORMAL);			\
+
 #define CREA_WXMAIN_WITH_CONSOLE					\
   int main(int argc, char* argv[])					\
   {									\
-    return WinMain(::GetModuleHandle(NULL), NULL,			\
-		   ::GetCommandLine(), SW_SHOWNORMAL);			\
+    char getcommandline2[512];							\
+	wcstombs(getcommandline2 , ::GetCommandLine() , 512);			\
+    return WinMain(::GetModuleHandle(NULL), NULL, getcommandline2, SW_SHOWNORMAL);			\
   }									
 
 #else // defined(_WIN32) 
@@ -85,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();
@@ -93,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;
   }
   //==================================================================
@@ -102,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);