Diego Caceres: creaButtonContainer & creaPanelButtonContainer changes

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 f03c746b79b476a95c71cb4070f3cb1350d2a739..7a7da4057690a5ce0dba613a1f793d67f81cdb73 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/containerSettings.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/containerSettings.cxx
@@ -45,6 +45,7 @@ namespace creaButtonContainer
                {
                        this->m_GroupNameList = m_GroupNameList;
                }
+
                void
                ContainerSettings::AddButton( const std::string & groupName,
                    const std::string buttonName, const std::string iconpath,
@@ -53,7 +54,17 @@ namespace creaButtonContainer
                        ButtonPair* pair = new ButtonPair(
                            new ButtonInfo( buttonName, iconpath ),
                            new ActionButton( buttonDescription, event ) );
+                       for( KeyMapList::iterator it = this->m_GroupNameList.begin( ); it
+                           != this->m_GroupNameList.end( ); ++it )
+                               if ( ( *it ).compare( groupName ) == 0 )
+                               {
+                                       this->m_ButtonGroupContainer[ groupName ].push_back( pair );
+                                       return;
+                               }//fi
+                       //rof
+                       this->m_GroupNameList.push_back( groupName );
                        this->m_ButtonGroupContainer[ groupName ].push_back( pair );
                }
+
        }
 }

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.cxx
index c3a24614db15955c3d3e5a545671f48307985e65..044e6e0562bae1c05e57a3195714c1b1d8cca77d 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.cxx
@@ -86,6 +86,16 @@ namespace creaPanelButtonContainer
                panel->Show( false );
                ButtonPair* pair = new ButtonPair( new ButtonInfo( buttonName, iconpath ),
                    new ActionButton( buttonDescription, panel ) );
+               for( KeyMapList::iterator it = this->m_GroupNameList.begin( ); it
+                   != this->m_GroupNameList.end( ); ++it )
+               {
+                       if ( ( *it ).compare( groupName ) == 0 )
+                       {
+                               this->m_ButtonGroupContainer[ groupName ].push_back( pair );
+                               return;
+                       }//fi
+               }//rof
+               this->m_GroupNameList.push_back( groupName );
                this->m_ButtonGroupContainer[ groupName ].push_back( pair );
        }
 
@@ -97,7 +107,18 @@ namespace creaPanelButtonContainer
                ButtonPair* pair = new ButtonPair(
                    new ButtonInfo( info.buttonName, info.iconpath ),
                    new ActionButton( info.buttonDescription, info.panel ) );
+               for( KeyMapList::iterator it = this->m_GroupNameList.begin( ); it
+                   != this->m_GroupNameList.end( ); ++it )
+               {
+                       if ( ( *it ).compare( info.groupName ) == 0 )
+                       {
+                               this->m_ButtonGroupContainer[ info.groupName ].push_back( pair );
+                               return;
+                       }//fi
+               }//rof
+               this->m_GroupNameList.push_back( info.groupName );
                this->m_ButtonGroupContainer[ info.groupName ].push_back( pair );
        }
+
 }//ecapseman