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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/containerSettings.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/containerSettings.cxx
index a4e18f9..7acfd8a 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/containerSettings.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/containerSettings.cxx
@@ -1,8 +1,33 @@
+/*# ---------------------------------------------------------------------
+#
+# 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 containerSettings.cxx
  * @brief Implements the ContainerSettings class.
  * @author Diego CACERES (diego.caceres[AT]creatis.insa-lyon.fr)
- * @date  2011-05-24
+ * @date  2011-06-02
  */
 
 #include "containerSettings.h"
@@ -23,13 +48,13 @@ namespace creaButtonContainer
 		ButtonGroupMap
 		ContainerSettings::GetButtonGroupContainer( )
 		{
-			return this->m_ButtonGroupContainer;
+			return ( this->m_ButtonGroupContainer );
 		}
 		// ----------------------------------------------------------------------------------
 		KeyMapList
 		ContainerSettings::GetGroupNameList( )
 		{
-			return this->m_GroupNameList;
+			return ( this->m_GroupNameList );
 		}
 		// ----------------------------------------------------------------------------------
 		void
@@ -45,15 +70,15 @@ namespace creaButtonContainer
 		}
 		// ----------------------------------------------------------------------------------
 		void
-		ContainerSettings::AddButton( const std::string & groupName,
-		    const std::string buttonName, const std::string iconpath,
-		    const std::string buttonDescription, FunctionEventType event )
+		ContainerSettings::AddButton( const StringType & groupName,
+		    const StringType &buttonName, const StringType &iconpath,
+		    const StringType &buttonDescription, FunctionEventType event )
 		{
+			ButtonPair* pair = new ButtonPair(
+			    new ButtonInfo( buttonName, iconpath ),
+			    new ButtonAction( buttonDescription, event ) );
 			try
 			{
-				ButtonPair* pair = new ButtonPair(
-				    new ButtonInfo( buttonName, iconpath ),
-				    new ButtonAction( buttonDescription, event ) );
 				for( KeyMapList::iterator it = this->m_GroupNameList.begin( ); it
 				    != this->m_GroupNameList.end( ); ++it )
 				{
@@ -79,11 +104,11 @@ namespace creaButtonContainer
 		void
 		ContainerSettings::AddButton( BCSettingsStruct* info )
 		{
+			ButtonPair* pair = new ButtonPair(
+			    new ButtonInfo( info->buttonName, info->iconpath ),
+			    new ButtonAction( info->buttonDescription, info->eventFunction ) );
 			try
 			{
-				ButtonPair* pair = new ButtonPair(
-				    new ButtonInfo( info->buttonName, info->iconpath ),
-				    new ButtonAction( info->buttonDescription, info->eventFunction ) );
 				for( KeyMapList::iterator it = this->m_GroupNameList.begin( ); it
 				    != this->m_GroupNameList.end( ); ++it )
 				{