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);
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()) );
return refreshed;
}
+#if (VTK_MAJOR_VERSION <= 7)
void HistogramDialog::setVolumeMapper(vtkVolumeRayCastMapper* volMapper)
+#else
+ void HistogramDialog::setVolumeMapper(vtkFixedPointVolumeRayCastMapper* volMapper)
+#endif
{
volumeMapper=volMapper;
}