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

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / creaButtonContainer / model / containerSettings.cxx

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/containerSettings.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/containerSettings.cxx
index 7acfd8a272f5b98b2f42fa1452da9645c62f1afc..d3f426967b37faf9d0a1c31c4d1d6ff97754fe66 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/containerSettings.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/containerSettings.cxx
@@ -44,6 +44,7 @@ namespace creaButtonContainer
                ContainerSettings::~ContainerSettings( )
                {
                }
+               
                // ----------------------------------------------------------------------------------
                ButtonGroupMap
                ContainerSettings::GetButtonGroupContainer( )
@@ -56,6 +57,7 @@ namespace creaButtonContainer
                {
                        return ( this->m_GroupNameList );
                }
+               
                // ----------------------------------------------------------------------------------
                void
                ContainerSettings::SetButtonGroupContainer( ButtonGroupMap bgContainer )
@@ -68,14 +70,15 @@ namespace creaButtonContainer
                {
                        this->m_GroupNameList = gNameList;
                }
+               
                // ----------------------------------------------------------------------------------
                void
                ContainerSettings::AddButton( const StringType & groupName,
-                   const StringType &buttonName, const StringType &iconpath,
+                   const StringType &buttonName, const wxBitmap &icon,
                    const StringType &buttonDescription, FunctionEventType event )
                {
                        ButtonPair* pair = new ButtonPair(
-                           new ButtonInfo( buttonName, iconpath ),
+                           new ButtonInfo( buttonName, icon ),
                            new ButtonAction( buttonDescription, event ) );
                        try
                        {
@@ -105,7 +108,7 @@ namespace creaButtonContainer
                ContainerSettings::AddButton( BCSettingsStruct* info )
                {
                        ButtonPair* pair = new ButtonPair(
-                           new ButtonInfo( info->buttonName, info->iconpath ),
+                           new ButtonInfo( info->buttonName, info->icon ),
                            new ButtonAction( info->buttonDescription, info->eventFunction ) );
                        try
                        {