Diego Caceres: creaPanelButtonContainer changes: new structButtonContainerSettings...

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.cxx
index 056158ad6a16658a0f92e228698a708b40f4205f..c3a24614db15955c3d3e5a545671f48307985e65 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.cxx
@@ -79,14 +79,25 @@ namespace creaPanelButtonContainer
 
        void
        ButtonContainerSettings::AddButton( const std::string & groupName,
-           const std::string buttonName, const std::string iconpath,
-           const std::string buttonDescription, PanelButton panel )
+           const std::string &buttonName, const std::string &iconpath,
+           const std::string &buttonDescription, PanelButton panel )
        {
                //builds the button information
+               panel->Show( false );
                ButtonPair* pair = new ButtonPair( new ButtonInfo( buttonName, iconpath ),
                    new ActionButton( buttonDescription, panel ) );
-               panel->Show( false );
                this->m_ButtonGroupContainer[ groupName ].push_back( pair );
        }
+
+       void
+       ButtonContainerSettings::AddButton( const BCSettingsStruct &info )
+       {
+               //builds the button information
+               info.panel->Show( false );
+               ButtonPair* pair = new ButtonPair(
+                   new ButtonInfo( info.buttonName, info.iconpath ),
+                   new ActionButton( info.buttonDescription, info.panel ) );
+               this->m_ButtonGroupContainer[ info.groupName ].push_back( pair );
+       }
 }//ecapseman
 

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.h
index 31d6993fb40a85ae1d8361ff623025a26fca53e0..81f96d31b88433947b4d9d4c1d9105b52b3b8892 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.h
@@ -14,6 +14,7 @@
 #include <map>
 #include <wx/panel.h>
 
+#include "structButtonContainerSettings.h"
 #include "containerSettings.h"
 #include "functor.h"
 
@@ -49,9 +50,11 @@ namespace creaPanelButtonContainer
                        void
                        SetGroupNameList( KeyMapList m_GroupNameList );
                        void
-                       AddButton( const std::string & groupName, const std::string buttonName,
-                           const std::string iconpath, const std::string buttonDescription,
+                       AddButton( const std::string &groupName, const std::string &buttonName,
+                           const std::string &iconpath, const std::string &buttonDescription,
                            PanelButton panel );
+                       void
+                       AddButton( const BCSettingsStruct &info );
 
                private:
                        ButtonGroupMap m_ButtonGroupContainer;

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/structButtonContainerSettings.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/structButtonContainerSettings.h
new file mode 100644 (file)
index 0000000..d151de3
--- /dev/null
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/structButtonContainerSettings.h
@@ -0,0 +1,14 @@
+#include <string.h>
+#include <wx/panel.h>
+
+typedef std::string StringType;
+typedef wxPanel PanelButton;
+
+struct BCSettingsStruct
+{
+               StringType groupName;
+               StringType buttonName;
+               StringType iconpath;
+               StringType buttonDescription;
+               PanelButton* panel;
+};