X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FcreaPanelButtonContainer%2FbuttonContainerSettings.h;h=a502b9a37fed363c3e2cb5a95f80a27916d9a469;hb=352ae750b47650f57bc952705f184995a2486468;hp=ef4819635b46eef281d65ff30cbd3c55e728fff5;hpb=34a9a0af17078bc3d7c5155aa72721d8248b4b71;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.h
index ef48196..a502b9a 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.h
@@ -34,6 +34,7 @@
 #define BUTTONCONTAINERSETTINGS_H_
 
 #include <wx/panel.h>
+#include <wx/bitmap.h>
 
 #include <list>
 #include <map>
@@ -82,12 +83,14 @@ namespace creaPanelButtonContainer
 			 *	First is the button description, Second FunctionEventType
 			 */
 			typedef std::pair< std::string, PanelButton > ActionButton;
+			
 			// ----------------------------------------------------------------------------------
-			/*!	@typedef std::pair< std::string, std::string > ButtonInfo;
+			/*!	@typedef std::pair< std::string, wxBitmap > ButtonInfo;
 			 *	@brief Defines the ButtonInfo type.
-			 *	First is the ButtonName, Second is the ImageIconPath
+			 *	First is the ButtonName, Second is the ImageIcon
 			 */
-			typedef std::pair< std::string, std::string > ButtonInfo;
+			typedef std::pair< std::string, wxBitmap > ButtonInfo;
+			
 			// ----------------------------------------------------------------------------------
 			/*!	@typedef std::pair< ButtonInfo*, ActionButton* > ButtonPair;
 			 *	@brief Defines the ButtonPair type.
@@ -98,11 +101,13 @@ namespace creaPanelButtonContainer
 			 *	@brief Defines the KeyMapList type.
 			 */
 			typedef std::list< std::string > KeyMapList;
+		
 			// ----------------------------------------------------------------------------------
 			/*!	@typedef std::list< ButtonPair* > ButtonList;
 			 *	@brief Defines the ButtonList type.
 			 */
-			typedef std::list< ButtonPair* > ButtonList;
+			typedef std::list< ButtonPair* > ButtonList;			
+			
 			// ----------------------------------------------------------------------------------
 			/*!	@typedef std::map< std::string, ButtonList > ButtonGroupMap;
 			 *	@brief Defines the ButtonGroupMap type.
@@ -130,6 +135,7 @@ namespace creaPanelButtonContainer
 			 */
 			virtual
 			~ButtonContainerSettings( );
+			
 			// ----------------------------------------------------------------------------------
 			/*! @fn ButtonGroupMap GetButtonGroupContainer( );
 			 *	@brief This method returns ButtonGroupMap with all buttons.
@@ -176,6 +182,7 @@ namespace creaPanelButtonContainer
 			 */
 			void
 			SetGroupNameList( KeyMapList gNameList );
+			
 			// ----------------------------------------------------------------------------------
 			/*! @fn void AddButton( const std::string &groupName, const std::string &buttonName,
 			 const std::string &iconpath, const std::string &buttonDescription,
@@ -190,8 +197,9 @@ namespace creaPanelButtonContainer
 			 */
 			void
 			AddButton( const std::string &groupName, const std::string &buttonName,
-			    const std::string &iconpath, const std::string &buttonDescription,
+			    const wxBitmap &icon, const std::string &buttonDescription,
 			    PanelButton panel );
+			
 			// ----------------------------------------------------------------------------------
 			/*! @fn void AddButton( BCPSettingsStruct* info );
 			 * @brief This method adds a new button into a group of buttons.
@@ -200,6 +208,7 @@ namespace creaPanelButtonContainer
 			 */
 			void
 			AddButton( BCPSettingsStruct* info );
+			
 			// ----------------------------------------------------------------------------------
 			/*! @fn void AddButtons( BCStructVectorType infoList );
 			 * @brief This method adds new buttons into the container.