X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracas_ViewerWidget.cxx;h=67f26f99e7f3c805d22d9f460656341a0944a3aa;hb=31d88339e6f5c346ec8542f05c7a9490434ef94f;hp=35d68fb78e3886b96b065844b4665aac8fd27e85;hpb=f9e9505b254e2cdee67e8eab439b22af9a86b292;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx
index 35d68fb..67f26f9 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: wxMaracas_ViewerWidget.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/04/23 16:03:30 $
-  Version:   $Revision: 1.7 $
+  Date:      $Date: 2009/04/24 15:26:02 $
+  Version:   $Revision: 1.9 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -182,27 +182,19 @@
 	  
 	wxMaracas_ViewerWidget::~wxMaracas_ViewerWidget()
 	{
+		if (mvtkmprbasedata)			{ delete mvtkmprbasedata;  }
+		if (mvtk2Dbaseview)				{ delete mvtk2Dbaseview; }
+		if (mvtkmpr2Dview_X)			{ delete mvtkmpr2Dview_X; }
+		if (mvtkmpr2Dview_Y)			{ delete mvtkmpr2Dview_Y; }
+		if (mvtkmpr2Dview_Z)			{ delete mvtkmpr2Dview_Z; }
+		if (mwidgetMesure)				{ delete mwidgetMesure; }
+		if (mvtkplane2Dview)			{ delete mvtkplane2Dview; }
+		if (mwxsphereview)				{ delete mwxsphereview; }
+		if (mwxvtkclipping3Dview)		{ delete mwxvtkclipping3Dview; }
+		if (mwxvtk3Dbaseview_Clipping3D){ delete mwxvtk3Dbaseview_Clipping3D; }
+		if (mwxvtkmpr3Dview)			{ delete mwxvtkmpr3Dview; }
 
-		testDelete(mvtkmprbasedata);
-		testDelete(mvtk2Dbaseview);
-		testDelete(mvtkmpr2Dview_X); 
-		testDelete(mvtkmpr2Dview_Y); 
-		testDelete(mvtkmpr2Dview_Z); 
-		testDelete(mwidgetMesure);
-		testDelete(mvtkplane2Dview);
-		testDelete(mwxsphereview); 
-		testDelete(mwxvtkclipping3Dview);
-		testDelete(mwxvtk3Dbaseview_Clipping3D);
-		testDelete(mwxvtkmpr3Dview);
-
-	}
-
-	void wxMaracas_ViewerWidget::testDelete(void* point){
-		if(point!=NULL){
-			delete point;  ///EED ??????
-		}
 	}
-	    
 	//------------------------------------------------------------------------------------------------------------
 	// Methods
 	//------------------------------------------------------------------------------------------------------------