#3128 creaMaracasVisu Feature New Normal - branch changeWx28to30 compilation with...

[creaMaracasVisu.git] / lib / GUI / Wx / VolumeRenderer / wxMaracasMultipleVolumeRendererView.cxx

diff --git a/lib/GUI/Wx/VolumeRenderer/wxMaracasMultipleVolumeRendererView.cxx b/lib/GUI/Wx/VolumeRenderer/wxMaracasMultipleVolumeRendererView.cxx
index c70043ebd797040fa2d5a00368fad2dc44666228..4560348f8f9a405b25dd3677e7be15de2e6f7bb7 100644 (file)
--- a/lib/GUI/Wx/VolumeRenderer/wxMaracasMultipleVolumeRendererView.cxx
+++ b/lib/GUI/Wx/VolumeRenderer/wxMaracasMultipleVolumeRendererView.cxx
@@ -230,7 +230,15 @@ ToolBarMultipleVolumeRenderer::ToolBarMultipleVolumeRenderer(wxWindow * parent,s
        //iconfil+= "/OpenImage.png";
        //wxBitmap* bitmap0 = new wxBitmap(wxString(iconfil.c_str(),wxConvUTF8), wxBITMAP_TYPE_PNG);
        wxBitmap bitmap0(OpenImage_xpm);
+
+
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
        this->AddTool(1, wxString(_T("test")),bitmap0, NULL, wxITEM_NORMAL, wxString(_T("Open File")));
+#else
+       this->AddTool(1, wxString(_T("test")),bitmap0 , wxString(_T("Open File")), wxITEM_NORMAL );
+#endif
+
 
        /*iconfil+= "/Open.png";
        wxBitmap* bitmap2 = new wxBitmap(wxString(iconfil.c_str(),wxConvUTF8), wxBITMAP_TYPE_PNG);