#2516 creaMaracasVisu Feature New Normal - creaPanelButtonContainer ListPanel with...

[creaMaracasVisu.git] / lib / maracasVisuLib / src / kernel / marTypes.h

diff --git a/lib/maracasVisuLib/src/kernel/marTypes.h b/lib/maracasVisuLib/src/kernel/marTypes.h
index d119451a5bffeb7d7f23db9dd1dd30c8b590b2c2..00b4e0ca0446b93894c2b8a07e7c0b00c77a53f9 100644 (file)
--- a/lib/maracasVisuLib/src/kernel/marTypes.h
+++ b/lib/maracasVisuLib/src/kernel/marTypes.h
@@ -1,16 +1,41 @@
+/*# ---------------------------------------------------------------------
+#
+# 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.
+# ------------------------------------------------------------------------ */
+
 /*=========================================================================
 
   Program:   wxMaracas
   Module:    $RCSfile: marTypes.h,v $
   Language:  C++
-  Date:      $Date: 2008/11/05 15:27:03 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2012/11/15 14:16:12 $
+  Version:   $Revision: 1.10 $
 
   Copyright: (c) 2002, 2003
   License:
-  
-     This software is distributed WITHOUT ANY WARRANTY; without even 
-     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
@@ -31,23 +56,27 @@
  */
 
 //JHCL - Start
-//If we're using windws
+//If we're using windows
+/*
 #if defined(WIN32)
-//If we're using a dynamic library
-# ifdef maracasVisuLib_BUILD_SHARED
-#   define MARACASVISULIB_EXPORTS __declspec( dllexport )
-# else
-#   define MARACASVISULIB_EXPORTS //__declspec( dllimport )
-# endif //maracasvisulib_EXPORTS
+       //If we're using a dynamic library
+       #ifdef creaMaracasVisu_BUILD_SHARED
+               #define MARACASVISULIB_EXPORTS __declspec( dllexport )
+       #else
+               #define MARACASVISULIB_EXPORTS __declspec( dllimport )
+       #endif //maracasvisulib_EXPORTS
 #else
-#   define MARACASVISULIB_EXPORTS 
+       #define MARACASVISULIB_EXPORTS
 #endif
+       */
+// LG 15/01/09 : Now use crea mechanism
+#include "creaMaracasVisu_EXPORT.h"
 //JHCL - End
 
+
+/*
 #if defined(WIN32) //&& defined(MARACAS_BUILD_SHARED_LIBS)
-//guerapa0
 # ifdef MaracasKernel_EXPORTS
-//querapa1
 #   define MAR_KERNEL_EXPORT __declspec( dllexport )
 # else
 #   define MAR_KERNEL_EXPORT //__declspec( dllimport )
@@ -65,6 +94,8 @@
 # define MAR_INTERFACEWX_EXPORT
 
 #endif //WIN32
+*/
+
 // Other ridiculous constants and typedefs. Just for fun!
 #define MAR_DEFAULT_FILE_PARAMETERS      "params.dat"
 #define MAR_DEFAULT_FILE_DICTIONARY      "marDict.txt"
@@ -76,14 +107,16 @@
  *
  *  This file is included by all project files.
  */
+
+#include "creaSystem.h"
+
+// This redefinitions shoul be useless using uint8_t, etc  // JPR
+
 typedef unsigned char  uchar;  /*!< unsigned char redefintion. */
 typedef unsigned int   uint;   /*!< unsigned int redefintion. */
 typedef unsigned long  ulong;  /*!< unsigned long redefintion. */
 typedef unsigned short ushort; /*!< unsigned short redefintion. */
 
-// Is this compilation using LibIDO?
-#define KGFO_USE_IDO
-
 // Is this compilation using VTK?
 #define KGFO_USE_VTK