#2502 creaMaracasVisu Feature New Normal - alternation between containers: button...

[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..836e5e0487bb596b20673e57c6c2a956673ca4d2 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,9 +57,10 @@ namespace creaButtonContainer
                {
                        return ( this->m_GroupNameList );
                }
+               
                // ----------------------------------------------------------------------------------
                void
-               ContainerSettings::SetButtonGroupContainer( ButtonGroupMap bgContainer )
+               ContainerSettings::SetButtonGroupContainer(ButtonGroupMap bgContainer)
                {
                        this->m_ButtonGroupContainer = bgContainer;
                }
@@ -68,14 +70,21 @@ 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 )
                {
+                       std::cout<< std::endl<<"MLER CLASS : ContainerSettings" << std::endl;
+                       std::cout<< std::endl<<"MLER ContainerSettings // AddButton "<<std::endl;
+
+
                        ButtonPair* pair = new ButtonPair(
-                           new ButtonInfo( buttonName, iconpath ),
+                           new ButtonInfo( buttonName, icon ),
                            new ButtonAction( buttonDescription, event ) );
                        try
                        {
@@ -84,6 +93,8 @@ namespace creaButtonContainer
                                {
                                        if ( ( *it ).compare( groupName ) == 0 )
                                        {
+                                               std::cout<<"MLER ContainerSettings // AddButton : it "<<*it <<std::endl;
+
                                                this->m_ButtonGroupContainer[ groupName ].push_back( pair );
                                                return;
                                        }//fi
@@ -105,7 +116,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
                        {
@@ -147,6 +158,8 @@ namespace creaButtonContainer
                                    << "exception: " << e.what( ) << std::endl;
                        }//hctac
                }
+
+
        // ----------------------------------------------------------------------------------
        }//ecapseman
 }//ecapseman