From: davila <eduardo.davila@creatis.insa-lyon.fr>
Date: Wed, 27 May 2015 14:18:27 +0000 (+0200)
Subject: Merge branch 'creaButtonContainer'
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=b61b15415d19c665de225637c9136c634a5831c5;p=creaMaracasVisu.git

Merge branch 'creaButtonContainer'

Conflicts:
	bbtk/src/bbcreaMaracasVisuPanelButtonContainer.cxx
---

b61b15415d19c665de225637c9136c634a5831c5
diff --cc bbtk/src/bbcreaMaracasVisuPanelButtonContainer.cxx
index fcc9903,b98efdd..004b8da
--- a/bbtk/src/bbcreaMaracasVisuPanelButtonContainer.cxx
+++ b/bbtk/src/bbcreaMaracasVisuPanelButtonContainer.cxx
@@@ -42,7 -42,11 +42,7 @@@ PanelButtonContainer::Process( 
  {
  	ButtonContainerSettings* settings = new ButtonContainerSettings( );
  	printf("EED PanelButtonContainer::Process %d\n", bbGetInputIn( ).size() );
- 	  settings->AddButtons(bbGetInputIn( ), bbGetInputType());
 -
 -
 -	  settings->InitModel(bbGetInputIn( ), bbGetInputType());
 -
 -	
++	settings->InitModel(bbGetInputIn( ), bbGetInputType());
  	PBContainer* panel = new PBContainer( myPanel, settings, bbGetInputType() );
  	wxBoxSizer* sizer  = new wxBoxSizer( wxHORIZONTAL );
  	sizer->Add( panel, 1, wxEXPAND, 0 );