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=255f774ce4100c0b84e6b5efa5c64d0db77f8a61;hp=bd2d1e4559b1f29ab1625b294707a4911461671a;hpb=e4ef2b5df5aac431ff3b806f83b7dd5e55e89d86;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 bd2d1e4..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);
@@ -359,7 +364,14 @@ wxSizer* HistogramDialog::getControls(bool extracontrols){
 
 void HistogramDialog::OnSaveData(wxCommandEvent& event)
 {
-	wxString nameF=wxFileSelector(_T("Save Data"), _T(" "),_T(""),_T(""),_T("*.*"),wxSAVE, NULL, -1,  -1);//wxFileSelector(_T("Save Data"),wxSAVE);
+	//wxFileSelector(_T("Save Data"),wxSAVE);
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
+	wxString nameF=wxFileSelector(_T("Save Data"), _T(" "),_T(""),_T(""),_T("*.*"),wxSAVE, NULL, -1,  -1);
+#else
+	wxString nameF=wxFileSelector(_T("Save Data"), _T(" "),_T(""),_T(""),_T("*.*"),wxFD_SAVE, NULL, -1,  -1);
+#endif
+
 	std::ofstream file;
 	if(nameF.CompareTo( _T("/0") )>0)
 		file.open( (const char*)(nameF.mb_str()) );
@@ -725,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;
 	}