X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FcreaButtonContainer%2Fmodel%2FcontainerSettings.h;h=2e359a2a694ffdeaa95f780a69e09d55a4439956;hb=8eebd53dcbe07edf0569621003178ee37d69a39b;hp=4d6ddb97dfea1b76d7d2753820f9545a3d25ae53;hpb=e4ef2b5df5aac431ff3b806f83b7dd5e55e89d86;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/containerSettings.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/containerSettings.h
index 4d6ddb9..2e359a2 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/containerSettings.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/containerSettings.h
@@ -34,6 +34,7 @@
 #define BUTTONGROUPSETTINGS_H_
 
 #include <vector>
+#include <wx/bitmap.h>
 
 #include "structBCSettings.h"
 #include "system.h"
@@ -41,6 +42,8 @@
 /*!	@namespace <creaButtonContainer>
  *	@brief Contains the creaButtonContainer library included in creaMaracasVisu.
  */
+
+
 namespace creaButtonContainer
 {
 	/*! @namespace <creaButtonContainer::model>
@@ -80,6 +83,7 @@ namespace creaButtonContainer
 				 */
 				virtual
 				~ContainerSettings( );
+				
 				// ----------------------------------------------------------------------------------
 				/*! @fn ButtonGroupMap ContainerSettings::GetButtonGroupContainer( )
 				 * 	@brief This method returns a container of buttons ordered by group.
@@ -94,6 +98,7 @@ namespace creaButtonContainer
 				 */
 				KeyMapList
 				GetGroupNameList( );
+				
 				// ----------------------------------------------------------------------------------
 				/*! void ContainerSettings::SetButtonGroupContainer( ButtonGroupMap m_ButtonGroupContainer )
 				 * 	@brief This method allows to create the ButtonGroupContainer.
@@ -101,6 +106,8 @@ namespace creaButtonContainer
 				 */
 				void
 				SetButtonGroupContainer( ButtonGroupMap bgContainer );
+
+
 				// ----------------------------------------------------------------------------------
 				/*! void ContainerSettings::SetGroupNameList( KeyMapList gNameList )
 				 * @brief This method sets a container with the name of the groups.
@@ -108,6 +115,8 @@ namespace creaButtonContainer
 				 */
 				void
 				SetGroupNameList( KeyMapList gNameList );
+				
+
 				// ----------------------------------------------------------------------------------
 				/*!
 				 * @fn ContainerSettings::AddButton( const std::string & groupName, const std::string buttonName,
@@ -124,7 +133,7 @@ namespace creaButtonContainer
 				 */
 				void
 				AddButton( const StringType & groupName, const StringType &buttonName,
-				    const StringType &iconpath, const StringType &buttonDescription,
+				    const wxBitmap &icon, const StringType &buttonDescription,
 				    FunctionEventType event );
 				// ----------------------------------------------------------------------------------
 				/*! @fn void AddButton( BCSettingsStruct* info );
@@ -143,10 +152,13 @@ namespace creaButtonContainer
 				 */
 				void
 				AddButtons( BCStructVectorType infoList );
+
+				// ----------------------------------------------------------------------------------
 				// ----------------------------------------------------------------------------------
 			private:
 				ButtonGroupMap m_ButtonGroupContainer; //! <The container with the group of buttons.
 				KeyMapList m_GroupNameList; //! <The container with the name of the groups of buttons.
+
 		};
 	}
 }