X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FcreaButtonContainer%2Fview%2FbuttonGroup.cxx;h=6dfeaa87ed1453bd80460d098d06862405cac444;hb=825f47d7d281a359e9fec03de88e7db58e9e49ff;hp=5a0db8b1a5adb71b4841ccc41ac395f117f69f4b;hpb=de7a931d43b373fdbaba530ae326a64d45148ae9;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonGroup.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonGroup.cxx
index 5a0db8b..6dfeaa8 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonGroup.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonGroup.cxx
@@ -2,7 +2,7 @@
  * @file buttonGroup.cxx
  * @brief Implements the ButtonGroup class.
  * @author Diego CACERES (diego.caceres[AT]creatis.insa-lyon.fr)
- * @date  2011-05-24
+ * @date  2011-06-02
  */
 
 #include "buttonGroup.h"
@@ -38,21 +38,21 @@ namespace creaButtonContainer
 		ButtonGroup::IdButtonContainer
 		ButtonGroup::GetButtonIdContainer( )
 		{
+			IdButtonContainer idContainer;
 			try
 			{
-				IdButtonContainer idContainer;
 				for( ButtonContainer::iterator it = this->m_Buttons.begin( ); it
 				    != this->m_Buttons.end( ); ++it )
 				{
 					idContainer.push_back( ( *it ).first );
-				}
-				return ( idContainer );
+				}//rof
 			}//yrt
 			catch ( std::exception& e )
 			{
 				std::cerr << "ButtonGroup::GetButtonIdContainer( )" << "exception: "
 				    << e.what( ) << std::endl;
 			}//hctac
+			return ( idContainer );
 		}
 		// ----------------------------------------------------------------------------------
 		Button*
@@ -60,13 +60,14 @@ namespace creaButtonContainer
 		{
 			try
 			{
-				return ( this->m_Buttons[ id ] );
+				//return ( this->m_Buttons[ id ] ); // JPR
 			}//yrt
 			catch ( std::exception& e )
 			{
 				std::cerr << "ButtonGroup::GetButton( long id )" << "exception: "
 				    << e.what( ) << std::endl;
 			}//hctac
+		        return ( this->m_Buttons[ id ] );// JPR
 		}
 	// ----------------------------------------------------------------------------------
 	}//ecapseman