From d56251fdac11d9948b9db6f1256b8c583366995c Mon Sep 17 00:00:00 2001
From: Ian McInerney <ian.s.mcinerney@ieee.org>
Date: Thu, 3 Jun 2021 02:29:09 +0100
Subject: [PATCH] Remove universal include of wx.h in 3d viewer OpenGL file

---
 3d-viewer/3d_rendering/legacy/3d_model.cpp | 1 +
 3d-viewer/3d_rendering/legacy/3d_model.h   | 2 ++
 3d-viewer/common_ogl/openGL_includes.h     | 2 --
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/3d-viewer/3d_rendering/legacy/3d_model.cpp b/3d-viewer/3d_rendering/legacy/3d_model.cpp
index a7aa17fe3b..b2e96cc65c 100644
--- a/3d-viewer/3d_rendering/legacy/3d_model.cpp
+++ b/3d-viewer/3d_rendering/legacy/3d_model.cpp
@@ -35,6 +35,7 @@
 #include "../common_ogl/ogl_utils.h"
 #include "../3d_math.h"
 #include <wx/debug.h>
+#include <wx/log.h>
 #include <chrono>
 #include <memory>
 
diff --git a/3d-viewer/3d_rendering/legacy/3d_model.h b/3d-viewer/3d_rendering/legacy/3d_model.h
index 746eead45b..055a47a7db 100644
--- a/3d-viewer/3d_rendering/legacy/3d_model.h
+++ b/3d-viewer/3d_rendering/legacy/3d_model.h
@@ -37,6 +37,8 @@
 #include "../3d_render_raytracing/shapes3D/bbox_3d.h"
 #include "../../3d_enums.h"
 
+#include <wx/chartype.h>
+
 class MODEL_3D
 {
 public:
diff --git a/3d-viewer/common_ogl/openGL_includes.h b/3d-viewer/common_ogl/openGL_includes.h
index a0bc2d4a02..d8df359229 100644
--- a/3d-viewer/common_ogl/openGL_includes.h
+++ b/3d-viewer/common_ogl/openGL_includes.h
@@ -30,8 +30,6 @@
 #ifndef OPENGL_INCLUDES_H
 #define OPENGL_INCLUDES_H
 
-#include <wx/wx.h>
-
 #ifdef __APPLE__
 // Apple, in their infinite wisdom, has decided to mark OpenGL as deprecated.
 // Luckily we can silence warnings about its deprecation.