DFCH: creaButtonContainer some bugs solved! =)

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 57cbf9b544572f124519244a19b6a7d996d47d50..ccba053d156cdd2b3b8970d3f3b370ac4d56bba6 100644 (file)
--- 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 80dee9a41172b129d35786b893cc58862311e880..601bababf0b2e62bfcbdeb8d1a9fa6b7bb3126b8 100644 (file)
--- 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