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=8462034bb47f89adbd9101b805239988d740191d;hb=f050938d3947f6b785289da6d58f8fec2da57421;hp=71662a200a1fa78c30e3b82404cc165975143940;hpb=de7a931d43b373fdbaba530ae326a64d45148ae9;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 71662a2..8462034 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/button.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/button.h @@ -2,7 +2,7 @@ * @file button.h * @brief Contains the Button class. * @author Diego CACERES (diego.caceres[AT]creatis.insa-lyon.fr) - * @date 2011-05-24 + * @date 2011-06-02 */ #ifndef BUTTON_H @@ -11,9 +11,7 @@ #include #include #include -#include -#include -#include "functor.h" + #include "system.h" /*! @namespace @@ -36,10 +34,12 @@ namespace creaButtonContainer { public: //typedef definition + // ---------------------------------------------------------------------------------- /*! @typedef creaButtonContainer::model::TFunctor TFunctor; * @brief Defines the TFunctor type. */ typedef creaButtonContainer::model::TFunctor TFunctor; + // ---------------------------------------------------------------------------------- //end of typedef definition public: // ---------------------------------------------------------------------------------- @@ -68,21 +68,21 @@ namespace creaButtonContainer * @brief This method returns the name of the button. * @return std::string The name of the button. */ - std::string + StringType GetButtonName( ); // ---------------------------------------------------------------------------------- /*! @fn std::string Button::GetIconPath( ); * @brief This method returns the iconPath of the button. * @return std::string The path of the icon. */ - std::string + StringType GetIconPath( ); // ---------------------------------------------------------------------------------- /*! @fn std::string Button::GetDescription( ); * @brief This method returns a the description of the button. * @return std::string The tooltip of the button. */ - std::string + StringType GetDescription( ); // ---------------------------------------------------------------------------------- /*! @fn void Button::Execute( ); @@ -96,7 +96,7 @@ namespace creaButtonContainer Execute( ); // ---------------------------------------------------------------------------------- private: - ButtonPair* m_ButtonPair; //!