X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FpPlotter%2FHistogramDialog.cxx;h=4f621cb350216666a5482e5f4b4c137ff7cd2b7e;hb=80b04dc9e3b981e24fe9ae0d81cdeb8af6e6f8c1;hp=082c05b6083fbe62639ec070485c30f6ba1293cf;hpb=bf3c5db84756087a5238ed47f56ddd527e670c66;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialog.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialog.cxx
index 082c05b..4f621cb 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialog.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialog.cxx
@@ -133,7 +133,12 @@ void HistogramDialog::initializeHistogramDialog(bool extracontrols){
     sizer->Add(bottomBox,0,wxCENTER);
 	SetAutoLayout( TRUE );
 	SetSizer( sizer );
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
 	SetBestSize(wxSize(600,600));
+#else
+	SetSize(wxSize(600,600));
+#endif
 }
 wxPanel* HistogramDialog::getPanExtraControls(){
 	wxBoxSizer* sizer0 = new wxBoxSizer(wxVERTICAL);
@@ -732,7 +737,11 @@ void HistogramDialog::OnRefreshBtn(wxCommandEvent &event)
 		return refreshed;
 	}
 	
+#if (VTK_MAJOR_VERSION <= 7) 
 	void HistogramDialog::setVolumeMapper(vtkVolumeRayCastMapper* volMapper)
+#else 
+	void HistogramDialog::setVolumeMapper(vtkFixedPointVolumeRayCastMapper* volMapper)
+#endif
 	{
 		volumeMapper=volMapper;
 	}