Last updates

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonContainerPanel.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonContainerPanel.cxx
index 4ba84066116fa99a407414668766d8583dc5804c..9eb3a56f0a8068049f33675a0eae096d6eb3b316 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonContainerPanel.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonContainerPanel.cxx
@@ -64,6 +64,8 @@ namespace creaButtonContainer
                {
                        this->m_Sizer->Fit( this );
                        this->m_Sizer->FitInside(this);
+                       this->SetScrollRate(20,20);
+                       this->m_Sizer->SetSizeHints(this);
                }
 
        }//ecapseman

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.cxx
index 044e6e0562bae1c05e57a3195714c1b1d8cca77d..4a685f4173df78a8f3a214263862704f493ae8cb 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.cxx
@@ -100,24 +100,35 @@ namespace creaPanelButtonContainer
        }
 
        void
-       ButtonContainerSettings::AddButton( const BCSettingsStruct &info )
+       ButtonContainerSettings::AddButton( BCSettingsStruct* info )
        {
                //builds the button information
-               info.panel->Show( false );
+               info->panel->Show( false );
                ButtonPair* pair = new ButtonPair(
-                   new ButtonInfo( info.buttonName, info.iconpath ),
-                   new ActionButton( info.buttonDescription, info.panel ) );
+                   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 )
+                       if ( ( *it ).compare( info->groupName ) == 0 )
                        {
-                               this->m_ButtonGroupContainer[ info.groupName ].push_back( pair );
+                               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 );
+               this->m_GroupNameList.push_back( info->groupName );
+               this->m_ButtonGroupContainer[ info->groupName ].push_back( pair );
+       }
+
+       void
+       ButtonContainerSettings::AddButtons( BCSetListType infoList )
+       {
+               for( BCSetListType::iterator it = infoList.begin( ); it
+                                   != infoList.end( ); ++it )
+               {
+                       BCSettingsStruct* info = *it;
+                       this->AddButton( info );
+               }//rof
        }
 
 }//ecapseman

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.h
index 81f96d31b88433947b4d9d4c1d9105b52b3b8892..e568683caf874eadf01905c80899f70c4be37a3b 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.h
@@ -31,6 +31,7 @@ namespace creaPanelButtonContainer
        typedef std::list< std::string > KeyMapList;
        typedef std::list< ButtonPair* > ButtonList;
        typedef std::map< std::string, ButtonList > ButtonGroupMap;
+       typedef std::list< BCSettingsStruct* > BCSetListType;
        class ButtonContainerSettings
        {
                public:
@@ -54,7 +55,10 @@ namespace creaPanelButtonContainer
                            const std::string &iconpath, const std::string &buttonDescription,
                            PanelButton panel );
                        void
-                       AddButton( const BCSettingsStruct &info );
+                       AddButton( BCSettingsStruct* info );
+
+                       void
+                       AddButtons( BCSetListType infoList );
 
                private:
                        ButtonGroupMap m_ButtonGroupContainer;