X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FcreaButtonContainer%2Fmodel%2Fsystem.h;h=93c87b304847c7b96e98a3046c9156c6ca156bff;hb=3d1c0689f4e1844c8f170d9c20f8ad38b34d98b6;hp=51db3bd5c136fa16fd6dcc7eca647bb4ac4bc601;hpb=978a6b69b838cd857d997d53e1392573853ae702;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/system.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/system.h
index 51db3bd..93c87b3 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/system.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/system.h
@@ -1,9 +1,34 @@
+/*# ---------------------------------------------------------------------
+#
+# 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.
+# ------------------------------------------------------------------------ */
+
 /*!
  * @file system.h
  * @brief Contains a system typedefs used to reuse code.
  * @author Diego CACERES (diego.caceres[AT]creatis.insa-lyon.fr)
- * @date  2011-05-24
-*/
+ * @date  2011-06-02
+ */
 
 #ifndef SYSTEM_H_
 #define SYSTEM_H_
@@ -12,6 +37,7 @@
 #include <map>
 #include <iostream>
 #include <exception>
+#include <string>
 #include "functor.h"
 
 /*!	@namespace <creaButtonContainer>
@@ -19,6 +45,12 @@
  */
 namespace creaButtonContainer
 {
+	// ----------------------------------------------------------------------------------
+	/*!	@typedef std::string* StringType;
+	 *	@brief Defines the StringType type.
+	 */
+	typedef std::string StringType;
+	// ----------------------------------------------------------------------------------
 	/*!	@typedef model::TFunctor* FunctionEventType;
 	 *	@brief Defines the FunctionEventType type.
 	 */
@@ -28,13 +60,13 @@ namespace creaButtonContainer
 	 *	@brief Defines the ActionButton type.
 	 *	First is the button description, Second FunctionEventType
 	 */
-	typedef std::pair< std::string, FunctionEventType > ButtonAction;
+	typedef std::pair< StringType, FunctionEventType > ButtonAction;
 	// ----------------------------------------------------------------------------------
 	/*!	@typedef std::pair< std::string, std::string > ButtonInfo;
 	 *	@brief Defines the ButtonInfo type.
 	 *	First is the ButtonName and Second is the IconPath
 	 */
-	typedef std::pair< std::string, std::string > ButtonInfo;
+	typedef std::pair< StringType, StringType > ButtonInfo;
 	// ----------------------------------------------------------------------------------
 	/*!	@typedef std::pair< ButtonInfo*, ActionButton* > ButtonPair;
 	 *	@brief Defines the ButtonPair type.
@@ -44,7 +76,7 @@ namespace creaButtonContainer
 	/*!	@typedef std::list< std::string > KeyMapList;
 	 *	@brief Defines the KeyMapList type.
 	 */
-	typedef std::list< std::string > KeyMapList;
+	typedef std::list< StringType > KeyMapList;
 	// ----------------------------------------------------------------------------------
 	/*!	@typedef std::list< ButtonPair* > ButtonList;
 	 *	@brief Defines the ButtonList type.
@@ -54,7 +86,7 @@ namespace creaButtonContainer
 	/*!	@typedef std::map< std::string, ButtonList > ButtonGroupMap;
 	 *	@brief Defines the ButtonGroupMap type.
 	 */
-	typedef std::map< std::string, ButtonList > ButtonGroupMap;
+	typedef std::map< StringType, ButtonList > ButtonGroupMap;
 // ----------------------------------------------------------------------------------
 }