DFCH: imageUndoRedo + Manual Paint: It doesn't works :s :s

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / creaButtonContainer / controller / buttonContainerController.cxx

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 bb28d530ea03bef373e3a83959eb561b139e1f56..7cba265abeefa6362d8f6106939e37e2391bff26 100644 (file)
--- 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: "