X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FcreaButtonContainer%2Fview%2FbuttonContainerPanel.h;h=5e145418c67106d564e33a79487b905346fbffe0;hb=e1c23d053ffe93035f13802efdb19dc116e4b46c;hp=4426590c5b873395cc08272ea9bd952b6400ad70;hpb=19866c24e0c00120d0a40da4d03d6eebc3e031b6;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonContainerPanel.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonContainerPanel.h index 4426590..5e14541 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonContainerPanel.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonContainerPanel.h @@ -133,11 +133,15 @@ namespace creaButtonContainer typedef creaButtonContainer::controller::ButtonContainerController BCController; -//EED-MLER typedef creaButtonContainer::view::ListGroup ListGroup; -//EED-MLER typedef std::list< ListGroup* > ListGroupList; + //typedef creaButtonContainer::model::ListGroupFactory ListGroupFactory; + + //typedef creaButtonContainer::view::ListGroup ListGroup; + + //typedef std::list< ListGroup* > ListGroupList; + + //typedef creaButtonContainer::model::ListGroupFactory ListGroupFactory; -//EED-MLER typedef creaButtonContainer::model::ListGroupFactory ListGroupFactory; // ---------------------------------------------------------------------------------- //end of typedef definition @@ -147,7 +151,7 @@ namespace creaButtonContainer * @param parent wxWindow pointer to parent. * @param settings ButtonGroupSettings Pointer to button container settings. */ - ButtonContainerPanel( wxWindow* parent, ButtonGroupSettings* settings, std::string type ); + ButtonContainerPanel( wxWindow* parent, ButtonGroupSettings* settings, int type ); // ---------------------------------------------------------------------------------- /*! @fn ~ButtonContainerPanel( ); * @brief This is the destructor. @@ -160,14 +164,18 @@ namespace creaButtonContainer * @param groupContainer */ void - SetGroupContainer( ButtonGroupList groupContainer ); + SetButtonGroupContainer( ButtonGroupList groupContainer ); // ---------------------------------------------------------------------------------- /*! @fn PanelInit( ); * This method initializes the panel. * @exception std::bad_alloc */ void - PanelInit( std::string type); + PanelInit( int type); + // ---------------------------------------------------------------------------------- + + //void + //SetListGroupContainer(ListGroupList groupContainer ); // ---------------------------------------------------------------------------------- /*! @fn FitSizer( ); * This method fits and organizes the sizer. @@ -183,7 +191,9 @@ namespace creaButtonContainer BCController* m_ButtonCController; //!