X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FcreaButtonContainer%2Fview%2FbuttonManager.h;fp=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FcreaButtonContainer%2Fview%2FbuttonManager.h;h=57c105f1f797c27732956704d3a1e3e4b883bfb3;hb=8eebd53dcbe07edf0569621003178ee37d69a39b;hp=7edb9bc655716d9e13513494d2d4910f5e3403ac;hpb=bbd33bbb0f352d14d7068d87fcd50e02341004a9;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonManager.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonManager.h
index 7edb9bc..57c105f 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonManager.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonManager.h
@@ -1,27 +1,27 @@
 /*# ---------------------------------------------------------------------
-#
-# 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.
-# ------------------------------------------------------------------------ */
+ #
+ # 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 buttonManager.h
@@ -43,8 +43,6 @@
 
 #include "button.h"
 #include "buttonGroup.h"
-#include "listWx.h"
-#include "listGroup.h"
 
 /*!	@namespace <creaButtonContainer>
  *	@brief Contains the creaButtonContainer library included in creaMaracasVisu.
@@ -62,7 +60,7 @@ namespace creaButtonContainer
 		 *  @details This class describes a wxFlexGridSizer with the button manager.
 		 *  @see <a href="http://docs.wxwidgets.org/stable/wx_wxflexGridSizer.html">wxFlexGridSizer</a>
 		 */
-		class ButtonManager : public wxFlexGridSizer
+		class ButtonManager: public wxFlexGridSizer
 		{
 			public:
 				//typedef definition.
@@ -80,11 +78,8 @@ namespace creaButtonContainer
 				/*!	@typedef std::map< long, Button* > ButtonContainer;
 				 *	@brief Defines the ButtonContainer type.
 				 */
-				typedef std::map< long, Button* > ButtonContainer;
+				typedef std::map<long, Button*> ButtonContainer;
 				// ----------------------------------------------------------------------------------
-				//MLER
-				//typedef creaButtonContainer::view::ListGroup ListGroup;
-				//typedef std::map<long, ListWx* > ListContainer;
 
 				//end of typedef definition.
 			public:
@@ -93,44 +88,42 @@ namespace creaButtonContainer
 				 * @brief This is the default constructor.
 				 * @exception std::bad_alloc
 				 */
-				ButtonManager( );
+				ButtonManager();
 				// ----------------------------------------------------------------------------------
 				/*! @fn ButtonManager( ButtonGroup* buttonGroup );
 				 * @brief This is the parameterized constructor
 				 * @param buttonGroup The group of buttons.
 				 */
-				ButtonManager( ButtonGroup* buttonGroup );
-				// ----------------------------------------------------------------------------------
-				//MLER
-				//ButtonManager (ListGroup* buttonGroup);
+				ButtonManager(ButtonGroup* buttonGroup);
+
 				// ----------------------------------------------------------------------------------
 
 				/*! @fn ~ButtonManager( );
 				 * @brief This is the destructor.
 				 */
 				virtual
-				~ButtonManager( );
+				~ButtonManager();
 				// ----------------------------------------------------------------------------------
 				/*! @fn SetGroupName( wxStaticText* groupName );
 				 * @details Sets the groupName.
 				 * @param groupName
 				 */
 				void
-				SetGroupName( wxStaticText* groupName );
+				SetGroupName(wxStaticText* groupName);
 				// ----------------------------------------------------------------------------------
 				/*! @fn ShowButtonManager( );
 				 * @brief This method shows the ButtonManager
 				 */
 
 				void
-				ShowButtonManager( );
+				ShowButtonManager();
 				// ----------------------------------------------------------------------------------
 				/*! @fn HideButtonManager( );
 				 * @brief This method hides the ButtonManager.
 				 * @exception std::bad_alloc
 				 */
 				void
-				HideButtonManager( );
+				HideButtonManager();
 				// ----------------------------------------------------------------------------------
 			private:
 				// ----------------------------------------------------------------------------------
@@ -139,19 +132,14 @@ namespace creaButtonContainer
 				 * @param buttonContainer
 				 */
 				void
-				SetButtonManager( ButtonContainer buttonContainer );
+				SetButtonManager(ButtonContainer buttonContainer);
 				// ----------------------------------------------------------------------------------
-				//MLER
-				/*void
-				SetListManager( ListContainer buttonContainer );*/
-				// ----------------------------------------------------------------------------------
-
 
 			private:
 				wxStaticText* m_GroupName; //!<The name of the group.
 				wxGridSizer* m_GridSizer; //!<The sizer that contains the buttons.
 		};
-	}//ecapseman
-}//ecapseman
+	} //ecapseman
+} //ecapseman
 
 #endif // CARTOBUTTONCONTAINER_H