Feature #1606 Add a new entry to ColorLayerImageView to select the fitting mode betwe...

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / creaButtonContainer / view / button.cxx

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/button.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/button.cxx
index 40b1697c46ea85d32feca11aa50fcb17a284bd3c..901da6cd315cc4c896a6974075d2bf6073f7f3c5 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/button.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/button.cxx
@@ -2,7 +2,7 @@
  * @file button.cxx
  * @brief Implements the Button class implementation.
  * @author Diego CACERES (diego.caceres[AT]creatis.insa-lyon.fr)
- * @date  2011-05-24
+ * @date  2011-06-02
  */
 
 #include "button.h"
@@ -12,12 +12,12 @@ namespace creaButtonContainer
        namespace view
        {
                // ----------------------------------------------------------------------------------
-               Button::Button( wxWindow* parent, long id, ButtonPair* pair )
+               Button::Button( wxWindow* parent, long id, ButtonPair* pair )           
                {
-                       this->m_ButtonPair = pair;
-                       std::string wXbuttonName = this->m_ButtonPair->first->first;
-                       std::string wXiconPath = this->m_ButtonPair->first->second;
-                       std::string wXdescription = this->m_ButtonPair->second->first;
+                       this->m_ButtonPair                      = pair;
+                       StringType wXbuttonName         = this->m_ButtonPair->first->first;
+                       StringType wXiconPath           = this->m_ButtonPair->first->second;
+                       StringType wXdescription        = this->m_ButtonPair->second->first;
                        wxString buttonName( wXbuttonName.c_str( ), wxConvUTF8 );
                        wxString imageIcon( wXiconPath.c_str( ), wxConvUTF8 );
                        wxString description( wXdescription.c_str( ), wxConvUTF8 );
@@ -28,36 +28,39 @@ namespace creaButtonContainer
                            buttonName );
                        this->SetToolTip( description );
                }
+               
                // ----------------------------------------------------------------------------------
                Button::~Button( )
                {
                }
+               
                // ----------------------------------------------------------------------------------
-               std::string
+               StringType
                Button::GetButtonName( )
                {
                        return ( this->m_ButtonPair->first->first );
                }
+               
                // ----------------------------------------------------------------------------------
-               std::string
+               StringType
                Button::GetIconPath( )
                {
                        return ( this->m_ButtonPair->first->second );
                }
+               
                // ----------------------------------------------------------------------------------
-               std::string
+               StringType
                Button::GetDescription( )
                {
                        return ( this->m_ButtonPair->second->first );
                }
+               
                // ----------------------------------------------------------------------------------
                void
                Button::Execute( )
                {
                        try
                        {
-                               std::cout << "ButtonAction: " << this->m_ButtonPair->first->first
-                                   << std::endl;
                                TFunctor* vTable[ ] =
                                { this->m_ButtonPair->second->second };
                                vTable[ 0 ]->Call( this->m_ButtonPair->first->first );