#3394 wxwidgets 3.2 macOS

[crea.git] / src / creaWx.h

diff --git a/src/creaWx.h b/src/creaWx.h
index 84a0390c0015180ea0475a24a003a7d71b70eece..1447201cd493d23a9b65368788ef3df09e5a3f8d 100644 (file)
--- a/src/creaWx.h
+++ b/src/creaWx.h
@@ -1,3 +1,30 @@
+/*
+# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
+#                        pour la Santé)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and 
+#  abiding by the rules of distribution of free software. You can  use, 
+#  modify and/ or redistribute the software under the terms of the CeCILL-B 
+#  license as circulated by CEA, CNRS and INRIA at the following URL 
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability. 
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ 
+*/                                                                         
+
 
 #ifndef __creaWx_h__INCLUDED__
 #define __creaWx_h__INCLUDED__
@@ -39,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) 
@@ -58,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();
@@ -66,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;
   }
   //==================================================================
@@ -75,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);