X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FcreaButtonContainer%2Fcontroller%2FbuttonContainerController.cxx;h=7cba265abeefa6362d8f6106939e37e2391bff26;hb=2725f81fc97c9faa92749159bdbaf9cedeef7af4;hp=bb28d530ea03bef373e3a83959eb561b139e1f56;hpb=de7a931d43b373fdbaba530ae326a64d45148ae9;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/controller/buttonContainerController.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/controller/buttonContainerController.cxx
index bb28d53..7cba265 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/controller/buttonContainerController.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/controller/buttonContainerController.cxx
@@ -2,7 +2,7 @@
  * @file buttonContainerController.cxx
  * @brief This contains the ButtonContainerController class implementation
  * @author Diego CACERES (diego.caceres[AT]creatis.insa-lyon.fr)
- * @date  2011-05-24
+ * @date  2011-06-02
  */
 
 #include "buttonContainerController.h"
@@ -19,7 +19,6 @@ namespace creaButtonContainer
 		// ----------------------------------------------------------------------------------
 		ButtonContainerController::~ButtonContainerController( )
 		{
-			delete this->m_BCPanel;
 		}
 		// ----------------------------------------------------------------------------------
 		void
@@ -51,7 +50,7 @@ namespace creaButtonContainer
 					}//rof
 				}//rof
 			}//yrt
-			catch ( std::exception& e )
+			catch ( const std::exception& e )
 			{
 				std::cerr << "ButtonContainerController::AddEvents( ) exception: "
 				    << e.what( ) << std::endl;
@@ -81,7 +80,7 @@ namespace creaButtonContainer
 				}//fi esle
 				this->m_BCPanel->FitSizer( );
 			}//yrt
-			catch ( std::exception& e )
+			catch ( const std::exception& e )
 			{
 				std::cerr
 				    << "ButtonContainerController::ButtonExpEvent( wxCommandEvent& event ) exception: "
@@ -98,10 +97,13 @@ namespace creaButtonContainer
 				    this->m_BCPanel->m_ButtonGroupList.begin( ); it
 				    != this->m_BCPanel->m_ButtonGroupList.end( ); ++it )
 				{
-					( *it )->GetButton( event.GetId( ) )->Execute( );
+					if ( ( *it )->GetButton( event.GetId( ) ) != NULL )
+					{
+						( *it )->GetButton( event.GetId( ) )->Execute( );
+					}//fi
 				}//rof
 			}//yrt
-			catch ( std::exception& e )
+			catch ( const std::exception& e )
 			{
 				std::cerr
 				    << "ButtonContainerController::ButtonEvent( wxCommandEvent& event ) exception: "