X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FcreaButtonContainer%2Fview%2Fbutton.h;h=f323c4de5bd2b6a8053fec71145563a8d7d69cfb;hb=05c4abbebf824bbbbaaab135acf6c888662dff69;hp=e8024bbec3f4259e3205993462f68c6de21b38d7;hpb=e4ef2b5df5aac431ff3b806f83b7dd5e55e89d86;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/button.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/button.h
index e8024bb..f323c4d 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/button.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/button.h
@@ -33,9 +33,11 @@
 #ifndef BUTTON_H
 #define BUTTON_H
 
+//#include <wx/listctrl.h>
 #include <wx/bmpbuttn.h>
 #include <wx/image.h>
 #include <wx/string.h>
+#include <wx/bitmap.h>
 
 #include "system.h"
 
@@ -67,6 +69,7 @@ namespace creaButtonContainer
 				// ----------------------------------------------------------------------------------
 				//end of typedef definition
 			public:
+				
 				// ----------------------------------------------------------------------------------
 				/*! @fn Button::Button( wxWindow* parent, long id, ButtonPair* pair );
 				 *	@brief This is the constructor.
@@ -95,13 +98,22 @@ namespace creaButtonContainer
 				 */
 				StringType
 				GetButtonName( );
+				
 				// ----------------------------------------------------------------------------------
 				/*! @fn std::string Button::GetIconPath( );
 				 * 	@brief This method returns the iconPath of the button.
 				 * 	@return std::string The path of the icon.
 				 */
-				StringType
-				GetIconPath( );
+				BitmapType
+				GetIcon( );
+
+				// ----------------------------------------------------------------------------------
+				/*! @fn std::string Button::GetIconPath( );
+				 * 	@brief This method returns the iconPath of the button.
+				 * 	@return std::string The path of the icon.
+				 */
+				//StringType
+				//GetIconPath( );
 				// ----------------------------------------------------------------------------------
 				/*! @fn std::string Button::GetDescription( );
 				 * 	@brief This method returns a the description of the button.
@@ -122,6 +134,7 @@ namespace creaButtonContainer
 				// ----------------------------------------------------------------------------------
 			private:
 				ButtonPair* m_ButtonPair; //! <The pair with the button information.
+				
 		};
 	}//ecapseman
 }//ecapseman