X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FcreaButtonContainer%2Fview%2Fbutton.h;h=f323c4de5bd2b6a8053fec71145563a8d7d69cfb;hb=05c4abbebf824bbbbaaab135acf6c888662dff69;hp=8462034bb47f89adbd9101b805239988d740191d;hpb=65c158dc171f8d3114ee3544b2a94a1f41880df0;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 8462034..f323c4d 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/button.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/button.h
@@ -1,3 +1,28 @@
+/*# ---------------------------------------------------------------------
+#
+# 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 button.h
  * @brief Contains the Button class.
@@ -8,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"
 
@@ -42,6 +69,7 @@ namespace creaButtonContainer
 				// ----------------------------------------------------------------------------------
 				//end of typedef definition
 			public:
+				
 				// ----------------------------------------------------------------------------------
 				/*! @fn Button::Button( wxWindow* parent, long id, ButtonPair* pair );
 				 *	@brief This is the constructor.
@@ -70,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.
@@ -97,6 +134,7 @@ namespace creaButtonContainer
 				// ----------------------------------------------------------------------------------
 			private:
 				ButtonPair* m_ButtonPair; //! <The pair with the button information.
+				
 		};
 	}//ecapseman
 }//ecapseman