From 11899b8f7418abb4b95b70cd574d2de1c7f353ca Mon Sep 17 00:00:00 2001 From: Diego Caceres Date: Tue, 24 Jan 2012 15:25:27 +0000 Subject: [PATCH] DFCH: creaButtonContainer some bugs solved! =) --- .../widgets/creaButtonContainer/model/buttonGroupFactory.cxx | 1 - .../creaPanelButtonContainer/buttonContainerSettings.cxx | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/buttonGroupFactory.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/buttonGroupFactory.cxx index 57cbf9b..ccba053 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/buttonGroupFactory.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/buttonGroupFactory.cxx @@ -54,7 +54,6 @@ namespace creaButtonContainer ButtonContainer buttonList; try { - ButtonContainer buttonList; for( ButtonList::iterator it = buttonModel.begin( ); it != buttonModel.end( ); ++it ) { diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.cxx index 80dee9a..601baba 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.cxx @@ -61,9 +61,10 @@ namespace creaPanelButtonContainer ButtonContainerSettings::ButtonGroupSettings* ButtonContainerSettings::GetButtonGroupSettings( TFunctor* functor ) { + ButtonGroupSettings* settings = NULL; try { - ButtonGroupSettings* settings = new ButtonGroupSettings( ); + settings = new ButtonGroupSettings( ); for( KeyMapList::iterator it = this->m_GroupNameList.begin( ); it != this->m_GroupNameList.end( ); ++it ) { @@ -74,7 +75,6 @@ namespace creaPanelButtonContainer ( *it1 )->first->second, ( *it1 )->second->first, functor ); }//rof }//rof - return ( settings ); }//yrt catch ( std::exception& e ) { @@ -82,6 +82,7 @@ namespace creaPanelButtonContainer << "ButtonContainerSettings::GetPanelButton( const StringType &buttonName ) " << "exception: " << e.what( ) << std::endl; }//hctac + return ( settings ); } // ---------------------------------------------------------------------------------- void -- 2.45.1