X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaWx.h;h=c97e10fb0dc35f66f337668c925a447072924ee3;hb=HEAD;hp=3a7d6bbd3edccfdbc0da4516c41deac232c8fc70;hpb=596488a9529ffbedea2e6693e32e9b19f042b7e7;p=crea.git

diff --git a/src/creaWx.h b/src/creaWx.h
index 3a7d6bb..c97e10f 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__
@@ -9,7 +36,6 @@
 #include "wx/wxprec.h"
 #include <wx/datetime.h>
 
-
 #ifdef __BORLANDC__
 #pragma hdrstop
 #endif
@@ -29,19 +55,37 @@ typedef void wxWindow;
 #endif // EO USE_WXWIDGETS
 //===========================================================================
 
+//===========================================================================
+#ifdef USE_WXWIDGETS
 
+#if defined(_WIN32) 
 
+//  How to have a Console and wxWidgets
+//  http://www.wxwidgets.org/wiki/index.php/MSVC_Setup_Guide
+//   In Visual C++ 6 (7 should be similar), to create an application that is both a console application 
+//  (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:
 
+#define CREA_WXMAIN_WITH_CONSOLE					\
+  int main(int argc, char* argv[])					\
+  {									\
+    return WinMain(::GetModuleHandle(NULL), NULL,			\
+		   ::GetCommandLine(), SW_SHOWNORMAL);			\
+  }									
 
+#else // defined(_WIN32) 
 
-//===========================================================================
-#ifdef USE_WXWIDGETS
+#define CREA_WXMAIN_WITH_CONSOLE
+
+#endif // defined(_WIN32) 
+
+#include <string>
 
 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();
@@ -53,7 +97,7 @@ namespace crea
     return wx;
   }
   //==================================================================
-  
+
   //==================================================================
   /// Conversion wxString to std::string
   inline std::string wx2std(const wxString& s){
@@ -68,8 +112,6 @@ namespace crea
     return s2;
   }
   //==================================================================
-  
-
 }
 
 #endif // EO USE_WXWIDGETS