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

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / creaButtonContainer / model / system.h

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/system.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/system.h
index 93c87b304847c7b96e98a3046c9156c6ca156bff..ab863ea211103dc75f02e9775b3f74a2f869c534 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/system.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/system.h
@@ -39,6 +39,7 @@
 #include <exception>
 #include <string>
 #include "functor.h"
+#include "wx/bitmap.h"
 
 /*!    @namespace <creaButtonContainer>
  *     @brief Contains the creaButtonContainer library included in creaMaracasVisu.
@@ -51,6 +52,11 @@ namespace creaButtonContainer
         */
        typedef std::string StringType;
        // ----------------------------------------------------------------------------------
+       /*!     @typedef std::string* BitmapType;
+        *      @brief Defines the BitmapType type.
+        */
+       typedef wxBitmap BitmapType;
+       // ----------------------------------------------------------------------------------
        /*!     @typedef model::TFunctor* FunctionEventType;
         *      @brief Defines the FunctionEventType type.
         */
@@ -61,12 +67,14 @@ namespace creaButtonContainer
         *      First is the button description, Second FunctionEventType
         */
        typedef std::pair< StringType, FunctionEventType > ButtonAction;
+       
        // ----------------------------------------------------------------------------------
-       /*!     @typedef std::pair< std::string, std::string > ButtonInfo;
+       /*!     @typedef std::pair< std::string, BitmapType > ButtonInfo;
         *      @brief Defines the ButtonInfo type.
         *      First is the ButtonName and Second is the IconPath
         */
-       typedef std::pair< StringType, StringType > ButtonInfo;
+       typedef std::pair< StringType, BitmapType > ButtonInfo;
+
        // ----------------------------------------------------------------------------------
        /*!     @typedef std::pair< ButtonInfo*, ActionButton* > ButtonPair;
         *      @brief Defines the ButtonPair type.
@@ -77,11 +85,13 @@ namespace creaButtonContainer
         *      @brief Defines the KeyMapList type.
         */
        typedef std::list< StringType > KeyMapList;
+       
        // ----------------------------------------------------------------------------------
        /*!     @typedef std::list< ButtonPair* > ButtonList;
         *      @brief Defines the ButtonList type.
         */
        typedef std::list< ButtonPair* > ButtonList;
+       
        // ----------------------------------------------------------------------------------
        /*!     @typedef std::map< std::string, ButtonList > ButtonGroupMap;
         *      @brief Defines the ButtonGroupMap type.