#3473 Stuck Render macOS

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / wxMaracasRendererView.cxx

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.cxx
index 108944d96e8e4bfddc5b56d4bfeb8a613c314bc7..ce9dfaa449db8a907803bbd7efa3ac9de19e57fc 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.cxx
@@ -31,6 +31,10 @@
 
 =========================================================================*/
 
+#include <wx/config.h>
+#include <creaWx.h>
+#include <wx/tooltip.h>
+
 #include "wxMaracasRendererView.h"
 
 #include <wx/colordlg.h>
@@ -209,7 +213,14 @@ ToolBarRenderer::ToolBarRenderer(wxWindow * parent,std::string iconsdir)
        //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
+
+
 
        this->Realize();