X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fappli%2FbbStudio%2FbbStudio.cxx;h=25e4612cf6f2fd227a4601f37534e3850519a199;hb=9a55784801f7fcfebbe935be9a7b68d8fd1cd6f2;hp=7e066269f562dabaa1dcd5f034d6bc522f48b1fd;hpb=d7e710c3fe8bd9c8c5fb79073bd5667b24c048f8;p=bbtk.git

diff --git a/kernel/appli/bbStudio/bbStudio.cxx b/kernel/appli/bbStudio/bbStudio.cxx
index 7e06626..25e4612 100644
--- a/kernel/appli/bbStudio/bbStudio.cxx
+++ b/kernel/appli/bbStudio/bbStudio.cxx
@@ -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.
+ # ------------------------------------------------------------------------ */
+
+
 #ifdef _USE_WXWIDGETS_
 
 //==========================================================================
@@ -8,14 +35,25 @@
 #include <wx/cmdline.h> 
 #include <vector>
 
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
+	static const wxCmdLineEntryDesc cmdLineDesc[] =
+	{
+	  { wxCMD_LINE_PARAM,  NULL, NULL, _T("file1 [file2 [...]]"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL }, 
+	  { wxCMD_LINE_SWITCH, _T("h"), _T("help"),   _T("Prints this help") },
+	  { wxCMD_LINE_SWITCH, _T("d"), _T("debug"),   _T("Message all 9") },
+	  { wxCMD_LINE_NONE }
+	};
+#else
+	static const wxCmdLineEntryDesc cmdLineDesc[] =
+	{
+	  { wxCMD_LINE_PARAM,  NULL, NULL, "file1 [file2 [...]]", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL }, 
+	  { wxCMD_LINE_SWITCH, "h", "help",   "Prints this help" },
+	  { wxCMD_LINE_SWITCH, "d", "debug",   "Message all 9" },
+	  { wxCMD_LINE_NONE }
+	};
+#endif
 
-static const wxCmdLineEntryDesc cmdLineDesc[] =
-{
-  { wxCMD_LINE_PARAM,  NULL, NULL, _T("file1 [file2 [...]]"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL }, 
-  { wxCMD_LINE_SWITCH, _T("h"), _T("help"),   _T("Prints this help") },
-  { wxCMD_LINE_SWITCH, _T("d"), _T("debug"),   _T("Message all 9") },
-  { wxCMD_LINE_NONE }
-};
 
 
 
@@ -115,6 +153,7 @@ int main(int argc, char* argv[])
 //==========================================================================
 // WITHOUT WX
 //==========================================================================
+#include <iostream>
 int main(int argc, char* argv[])
 {  
   std::cout << "bbStudio was not compiled with wxWidgets : ciao !" <<std::endl;