]> Creatis software - creaMaracasVisu.git/commitdiff
Merge branch 'creaButtonContainer'
authordavila <eduardo.davila@creatis.insa-lyon.fr>
Wed, 27 May 2015 14:18:27 +0000 (16:18 +0200)
committerdavila <eduardo.davila@creatis.insa-lyon.fr>
Wed, 27 May 2015 14:18:27 +0000 (16:18 +0200)
Conflicts:
bbtk/src/bbcreaMaracasVisuPanelButtonContainer.cxx

1  2 
bbtk/src/bbcreaMaracasVisuPanelButtonContainer.cxx

index fcc9903ea0ce63d4119f8a1ed71829b3ee08a548,b98efdd3cf714fecfad05e23edf5ae2fe85ffc7e..004b8dab40d2e312bf33d32e6fa57fcc225f5861
@@@ -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 );