From 868d9b8b70e6bd4921f9bcb413f2bdd5634b6692 Mon Sep 17 00:00:00 2001
From: codereader <greebo@angua.at>
Date: Thu, 14 Oct 2021 17:13:20 +0200
Subject: [PATCH] #5588: Move iwxgl.h header to ui/ folder.

---
 include/{ => ui}/iwxgl.h           | 0
 libs/wxutil/GLWidget.cpp           | 2 +-
 radiant/ui/gl/WxGLWidgetManager.h  | 2 +-
 tools/msvc/include.vcxproj         | 2 +-
 tools/msvc/include.vcxproj.filters | 4 +++-
 5 files changed, 6 insertions(+), 4 deletions(-)
 rename include/{ => ui}/iwxgl.h (100%)

diff --git a/include/iwxgl.h b/include/ui/iwxgl.h
similarity index 100%
rename from include/iwxgl.h
rename to include/ui/iwxgl.h
diff --git a/libs/wxutil/GLWidget.cpp b/libs/wxutil/GLWidget.cpp
index 1e0f14fff0..dc07734ef4 100644
--- a/libs/wxutil/GLWidget.cpp
+++ b/libs/wxutil/GLWidget.cpp
@@ -2,7 +2,7 @@
 
 #include "igl.h"
 #include "itextstream.h"
-#include "iwxgl.h"
+#include "ui/iwxgl.h"
 
 #include "GLContext.h"
 
diff --git a/radiant/ui/gl/WxGLWidgetManager.h b/radiant/ui/gl/WxGLWidgetManager.h
index c230750d1c..0b38071907 100644
--- a/radiant/ui/gl/WxGLWidgetManager.h
+++ b/radiant/ui/gl/WxGLWidgetManager.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <set>
-#include "iwxgl.h"
+#include "ui/iwxgl.h"
 
 namespace ui
 {
diff --git a/tools/msvc/include.vcxproj b/tools/msvc/include.vcxproj
index 84cb4d4d2a..6c615d9596 100644
--- a/tools/msvc/include.vcxproj
+++ b/tools/msvc/include.vcxproj
@@ -196,7 +196,6 @@
     <ClInclude Include="..\..\include\iundo.h" />
     <ClInclude Include="..\..\include\iversioncontrol.h" />
     <ClInclude Include="..\..\include\ivolumetest.h" />
-    <ClInclude Include="..\..\include\iwxgl.h" />
     <ClInclude Include="..\..\include\mapfile.h" />
     <ClInclude Include="..\..\include\modelskin.h" />
     <ClInclude Include="..\..\include\ModResource.h" />
@@ -222,6 +221,7 @@
     <ClInclude Include="..\..\include\ui\istatusbarmanager.h" />
     <ClInclude Include="..\..\include\ui\itoolbarmanager.h" />
     <ClInclude Include="..\..\include\ui\iuserinterface.h" />
+    <ClInclude Include="..\..\include\ui\iwxgl.h" />
     <ClInclude Include="..\..\include\version.h" />
     <ClInclude Include="..\..\include\VolumeIntersectionValue.h" />
   </ItemGroup>
diff --git a/tools/msvc/include.vcxproj.filters b/tools/msvc/include.vcxproj.filters
index 7d096a2f07..822b0d464a 100644
--- a/tools/msvc/include.vcxproj.filters
+++ b/tools/msvc/include.vcxproj.filters
@@ -100,7 +100,6 @@
     <ClInclude Include="..\..\include\iundo.h" />
     <ClInclude Include="..\..\include\iversioncontrol.h" />
     <ClInclude Include="..\..\include\ivolumetest.h" />
-    <ClInclude Include="..\..\include\iwxgl.h" />
     <ClInclude Include="..\..\include\mapfile.h" />
     <ClInclude Include="..\..\include\modelskin.h" />
     <ClInclude Include="..\..\include\ModResource.h" />
@@ -160,6 +159,9 @@
     <ClInclude Include="..\..\include\ui\iuserinterface.h">
       <Filter>ui</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\ui\iwxgl.h">
+      <Filter>ui</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="ui">