From 4b130e793b0ce53fb4ecfad76a79900d7ea6cbef Mon Sep 17 00:00:00 2001 From: Joseph Lenox Date: Tue, 17 Jul 2018 17:54:19 -0500 Subject: [PATCH] Use wxWidgets 3.0.x+ constructor for glcanvas. --- src/GUI/Scene3D.cpp | 2 +- src/GUI/Scene3D.hpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/GUI/Scene3D.cpp b/src/GUI/Scene3D.cpp index cb4b059bd..d1c560a2a 100644 --- a/src/GUI/Scene3D.cpp +++ b/src/GUI/Scene3D.cpp @@ -8,7 +8,7 @@ namespace Slic3r { namespace GUI { Scene3D::Scene3D(wxWindow* parent, const wxSize& size) : - wxGLCanvas(parent, wxID_ANY, wxDefaultPosition, size) + wxGLCanvas(parent, wxID_ANY, nullptr, wxDefaultPosition, size) { this->glContext = new wxGLContext(this); diff --git a/src/GUI/Scene3D.hpp b/src/GUI/Scene3D.hpp index 21dd47108..237b784c2 100644 --- a/src/GUI/Scene3D.hpp +++ b/src/GUI/Scene3D.hpp @@ -4,7 +4,8 @@ #ifndef WX_PRECOMP #include #endif - #include + +#include #include "Settings.hpp" #include "Point.hpp" #include "3DScene.hpp"