2413 creaMaracasVisu Feature New Normal New blackBox BitmapButtonIcon and fix the...

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

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 e8024bbec3f4259e3205993462f68c6de21b38d7..b7a8fb6093a95b6d3ab7427ee33cd32d7a063367 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/button.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/button.h
@@ -36,6 +36,7 @@
 #include <wx/bmpbuttn.h>
 #include <wx/image.h>
 #include <wx/string.h>
+#include <wx/bitmap.h>
 
 #include "system.h"
 
@@ -67,6 +68,7 @@ namespace creaButtonContainer
                                // ----------------------------------------------------------------------------------
                                //end of typedef definition
                        public:
+                               
                                // ----------------------------------------------------------------------------------
                                /*! @fn Button::Button( wxWindow* parent, long id, ButtonPair* pair );
                                 *      @brief This is the constructor.
@@ -95,13 +97,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 +133,7 @@ namespace creaButtonContainer
                                // ----------------------------------------------------------------------------------
                        private:
                                ButtonPair* m_ButtonPair; //! <The pair with the button information.
+                               
                };
        }//ecapseman
 }//ecapseman