From be408b27f8b2905e3be2cfdbf8a78d30801a7a32 Mon Sep 17 00:00:00 2001
From: Diego Caceres <Diego.Caceres@creatis.insa-lyon.fr>
Date: Mon, 9 May 2011 15:26:50 +0000
Subject: [PATCH] Diego Caceres: creaPanelButtonContainer changes: new
 structButtonContainerSettings and its asociation with buttonContainerSettings

---
 .../buttonContainerSettings.cxx                 | 17 ++++++++++++++---
 .../buttonContainerSettings.h                   |  7 +++++--
 .../structButtonContainerSettings.h             | 14 ++++++++++++++
 3 files changed, 33 insertions(+), 5 deletions(-)
 create mode 100644 lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/structButtonContainerSettings.h

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.cxx
index 056158a..c3a2461 100644
--- 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 31d6993..81f96d3 100644
--- 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
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;
+};
-- 
2.45.1