X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaWx.h;h=4a5e5f4d0ea3d84e9236c7ee506dae674e543a15;hb=a47e92c81210557bc19441faef4afd1cf28a84d3;hp=84a0390c0015180ea0475a24a003a7d71b70eece;hpb=209c90db5267285231d51ae34efe6c238eb520c0;p=crea.git diff --git a/src/creaWx.h b/src/creaWx.h index 84a0390..4a5e5f4 100644 --- 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)