DFCH

[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 d45f9c21fac05bad7b4a6b44107c3169c31ddb7f..323e2a78813e4734f7f1e7bcae3e4b7c56bd6f94 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"
@@ -15,9 +15,9 @@ namespace creaButtonContainer
                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;
+                       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 );
@@ -33,19 +33,19 @@ namespace creaButtonContainer
                {
                }
                // ----------------------------------------------------------------------------------
-               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 );
@@ -56,13 +56,11 @@ namespace creaButtonContainer
                {
                        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 );
                        }//yrt
-                       catch ( std::exception& e )
+                       catch ( const std::exception& e )
                        {
                                std::cerr << "Button::Execute( ) exception: " << e.what( ) << std::endl;
                        }//hctac