X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FcreaButtonContainer%2Fview%2FlistWx.h;h=970799c44088320653534ee6c3639bae1899ed0e;hb=ff116b1d805145619b44879358f1fa8521ef5569;hp=905dbec35612b45dc4f1678b313b84e8815156ad;hpb=db86dba6381cc26c3fa1070608b2ac56abeb823c;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/listWx.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/listWx.h
index 905dbec..970799c 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/listWx.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/listWx.h
@@ -28,10 +28,14 @@
 #define LISTWX_H
 
 //#include <wx/bmpbuttn.h>
+#include <wx/panel.h>
 #include <wx/image.h>
 #include <wx/string.h>
 #include <wx/bitmap.h>
 #include <wx/listctrl.h>
+#include <map>
+#include <cstring>
+#include "functor.h"
 
 #include "system.h"
 
@@ -46,10 +50,10 @@ namespace creaButtonContainer
 			public:
 
 				typedef creaButtonContainer::model::TFunctor TFunctor;
-
+				typedef std::map<std::string, wxPanel*> ItemsMap;
 			public:
 
-				ListWx( wxWindow* parent, long id, ButtonPair* pair );
+				ListWx( wxWindow* parent, wxWindowID id, ItemsMap iMap , TFunctor* functor );
 				// ----------------------------------------------------------------------------------
 
 				virtual
@@ -58,27 +62,13 @@ namespace creaButtonContainer
 
 				long
 				GetID( );
-				// ----------------------------------------------------------------------------------
-
-				StringType
-				GetButtonName( );
-
-				// ----------------------------------------------------------------------------------
-
-				BitmapType
-				GetIcon( );
-
-				// ----------------------------------------------------------------------------------
-
-				StringType
-				GetDescription( );
-				// ----------------------------------------------------------------------------------
 
 				void
-				Execute( );
+				ButtonEvent( wxCommandEvent& event );
 				// ----------------------------------------------------------------------------------
 			private:
-				ButtonPair* m_ButtonPair; //! <The pair with the button information.
+				ItemsMap m_itemsMap; //! <The pair with the button information.
+				TFunctor* functor;
 
 		};
 	}//ecapseman