X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbmaracasvisuContourVOI.cxx;h=5ed739c404743cfc4bf63649f7641d0b08e93f42;hb=56eb704bce4e7a4206ffa16c84f3000b8b8f93eb;hp=536d67833e6ab35e184e288bcecc4b682c668bef;hpb=e4ef2b5df5aac431ff3b806f83b7dd5e55e89d86;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbmaracasvisuContourVOI.cxx b/bbtk/src/bbmaracasvisuContourVOI.cxx
index 536d678..5ed739c 100644
--- a/bbtk/src/bbmaracasvisuContourVOI.cxx
+++ b/bbtk/src/bbmaracasvisuContourVOI.cxx
@@ -64,13 +64,21 @@ END_EVENT_TABLE( );
 			initializeVOIWidget();
 		}			
   }
-   void wxWidgetVOI::initializeVOIWidget(){
+
+   void wxWidgetVOI::initializeVOIWidget()
+	{
 	   wxSizer* sizer = this->GetSizer();
 
 
 /// \TODO fix deprecated warning: virtual bool wxSizer::Remove(wxWindow*) is deprecated (declared at /usr/include/wx-2.8/wx/sizer.h:513)		
-		if(mcontourvoiwidget!=NULL){
-			sizer->Remove(	mcontourvoiwidget );	
+		if(mcontourvoiwidget!=NULL)
+		{
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
+			sizer->Remove( mcontourvoiwidget );	
+#else
+			sizer->Detach( mcontourvoiwidget );	
+#endif
 			mcontourvoiwidget->Destroy();
 		}
 
@@ -84,10 +92,13 @@ END_EVENT_TABLE( );
 		this->Refresh();
   }
 
-  void wxWidgetVOI::setBaseView(wxVtkBaseView * wxvtkbaseview){
+  void wxWidgetVOI::setBaseView(wxVtkBaseView * wxvtkbaseview)
+	{
 	  this->wxvtkbaseview = wxvtkbaseview;
   }
-  void wxWidgetVOI::setImageData(vtkImageData * imagedata){
+
+  void wxWidgetVOI::setImageData(vtkImageData * imagedata)
+	{
 	  this->imagedata = imagedata;
   }