X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FcreaButtonContainer%2Fmodel%2FbuttonGroupFactory.cxx;h=57cbf9b544572f124519244a19b6a7d996d47d50;hb=825f47d7d281a359e9fec03de88e7db58e9e49ff;hp=395f12d3b763246c42dff8369d400832283b2d76;hpb=978a6b69b838cd857d997d53e1392573853ae702;p=creaMaracasVisu.git

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 395f12d..57cbf9b 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/buttonGroupFactory.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/buttonGroupFactory.cxx
@@ -2,7 +2,7 @@
  * @file buttonGroupFactory.cxx
  * @brief Implements the ButtonGroupFactory class.
  * @author Diego CACERES (diego.caceres[AT]creatis.insa-lyon.fr)
- * @date  2011-05-24
+ * @date  2011-06-02
  */
 
 #include "buttonGroupFactory.h"
@@ -24,9 +24,9 @@ namespace creaButtonContainer
 		ButtonGroupFactory::CreateButtonGroupContainer( wxWindow* parent,
 		    ButtonGroupModel* settings )
 		{
+			ButtonGroupContainer groupView;
 			try
 			{
-				ButtonGroupContainer groupView;
 				ButtonGroupMap map = settings->GetButtonGroupContainer( );
 				for( ButtonGroupMap::iterator it = map.begin( ); it != map.end( ); ++it )
 				{
@@ -37,8 +37,7 @@ namespace creaButtonContainer
 					ButtonGroup* group = new ButtonGroup( wxGroupName,
 					    this->GetButtons( parent, ( *it ).second ) );
 					groupView.push_back( group );
-				}
-				return ( groupView );
+				}//rof
 			}//yrt
 			catch ( const std::exception& e )
 			{
@@ -46,6 +45,7 @@ namespace creaButtonContainer
 				    << "ButtonGroupFactory::CreateButtonGroupContainer( wxWindow* parent,   ButtonGroupModel* settings )"
 				    << " exception: " << e.what( ) << std::endl;
 			}//chtac
+			return ( groupView );
 		}
 		// ----------------------------------------------------------------------------------
 		ButtonGroupFactory::ButtonContainer
@@ -60,8 +60,8 @@ namespace creaButtonContainer
 				{
 					long id = wxNewId( );
 					buttonList[ id ] = new Button( parent, id, *it );
-				}
-				return ( buttonList );
+				}//rof
+				//return ( buttonList ); // JPR
 			}//yrt
 			catch ( const std::exception& e )
 			{
@@ -69,6 +69,7 @@ namespace creaButtonContainer
 				    << "ButtonGroupFactory::GetButtons( wxWindow* parent, ButtonList buttonModel )"
 				    << "exception: " << e.what( ) << std::endl;
 			}//chtac
+		        return ( buttonList );	 // JPR
 		}
 	// ----------------------------------------------------------------------------------
 	}//ecapseman