Merge branch 'creaButtonContainer'

[creaMaracasVisu.git] / bbtk / src / bbcreaMaracasVisuPanelButtonContainer.cxx

diff --git a/bbtk/src/bbcreaMaracasVisuPanelButtonContainer.cxx b/bbtk/src/bbcreaMaracasVisuPanelButtonContainer.cxx
index 3f30cba3e6e3675a08b280fbbdbf51dce3b10a07..004b8dab40d2e312bf33d32e6fa57fcc225f5861 100644 (file)
--- a/bbtk/src/bbcreaMaracasVisuPanelButtonContainer.cxx
+++ b/bbtk/src/bbcreaMaracasVisuPanelButtonContainer.cxx
@@ -42,16 +42,7 @@ PanelButtonContainer::Process( )
 {
        ButtonContainerSettings* settings = new ButtonContainerSettings( );
        printf("EED PanelButtonContainer::Process %d\n", bbGetInputIn( ).size() );
-
-       if(bbGetInputType()== "1")
-       {
-//EED-MLER        settings->AddItems( bbGetInputIn() );
-       }
-       else {
-         settings->AddButtons( bbGetInputIn() );
-       }       
-
-       
+       settings->InitModel(bbGetInputIn( ), bbGetInputType());
        PBContainer* panel = new PBContainer( myPanel, settings, bbGetInputType() );
        wxBoxSizer* sizer  = new wxBoxSizer( wxHORIZONTAL );
        sizer->Add( panel, 1, wxEXPAND, 0 );
@@ -70,8 +61,8 @@ void PanelButtonContainer::CreateWidget( wxWindow* parent )
        this->myPanel = new wxPanel( parent, -1 );
        /// \TODO fix  warning: unused variable ww
        wxWindow* ww = bbCreateWidgetOfInput( "In", this->myPanel );
-       bbSetOutputWidget( myPanel);
-
+       ww=NULL;
+       bbSetOutputWidget( myPanel );
 }
 //===== 
 // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
@@ -79,7 +70,7 @@ void PanelButtonContainer::CreateWidget( wxWindow* parent )
 void
 PanelButtonContainer::bbUserSetDefaultValues( )
 {
-   bbSetInputType("0");
+   bbSetInputType(0);
 }
 //===== 
 // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)