From 48a5d6c5f835ce70d7b06a89a51a164b58c19dad Mon Sep 17 00:00:00 2001
From: Mart Raudsepp <leio@gentoo.org>
Date: Thu, 4 Jan 2018 16:12:15 +0200
Subject: [PATCH] Move wx/evtloopsrc.h to BASE_CMN_HDR from GUI_CMN_HDR

This header ends up being included by wx/apptrait.h, which is in
BASE_CMN_HDR, so it needs itself to be there too in order for
compilation to work when using non-GUI library build.

Closes #18038.
---
 Makefile.in                       | 3 ++-
 build/bakefiles/files.bkl         | 2 +-
 build/files                       | 2 +-
 build/msw/wx_base.vcxproj         | 1 +
 build/msw/wx_base.vcxproj.filters | 3 +++
 build/msw/wx_core.vcxproj         | 1 -
 build/msw/wx_core.vcxproj.filters | 3 ---
 build/msw/wx_vc7_base.vcproj      | 3 +++
 build/msw/wx_vc7_core.vcproj      | 3 ---
 build/msw/wx_vc8_base.vcproj      | 4 ++++
 build/msw/wx_vc8_core.vcproj      | 4 ----
 build/msw/wx_vc9_base.vcproj      | 4 ++++
 build/msw/wx_vc9_core.vcproj      | 4 ----
 13 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 3a49998522..c00dbf1699 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -406,6 +406,7 @@ ALL_BASE_HEADERS =  \
 	wx/event.h \
 	wx/eventfilter.h \
 	wx/evtloop.h \
+	wx/evtloopsrc.h \
 	wx/except.h \
 	wx/features.h \
 	wx/flags.h \
@@ -588,6 +589,7 @@ ALL_PORTS_BASE_HEADERS =  \
 	wx/event.h \
 	wx/eventfilter.h \
 	wx/evtloop.h \
+	wx/evtloopsrc.h \
 	wx/except.h \
 	wx/features.h \
 	wx/flags.h \
@@ -3920,7 +3922,6 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
 	wx/docmdi.h \
 	wx/docview.h \
 	wx/effects.h \
-	wx/evtloopsrc.h \
 	wx/fdrepdlg.h \
 	wx/filectrl.h \
 	wx/filehistory.h \
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 850ba226f1..85658c2a8c 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -595,6 +595,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/event.h
     wx/eventfilter.h
     wx/evtloop.h
+    wx/evtloopsrc.h
     wx/except.h
     wx/features.h
     wx/flags.h
@@ -1101,7 +1102,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/docmdi.h
     wx/docview.h
     wx/effects.h
-    wx/evtloopsrc.h
     wx/fdrepdlg.h
     wx/filectrl.h
     wx/filehistory.h
diff --git a/build/files b/build/files
index 757ffab063..d450ec7464 100644
--- a/build/files
+++ b/build/files
@@ -526,6 +526,7 @@ BASE_CMN_HDR =
     wx/event.h
     wx/eventfilter.h
     wx/evtloop.h
+    wx/evtloopsrc.h
     wx/except.h
     wx/features.h
     wx/flags.h
@@ -1021,7 +1022,6 @@ GUI_CMN_HDR =
     wx/docmdi.h
     wx/docview.h
     wx/effects.h
-    wx/evtloopsrc.h
     wx/fdrepdlg.h
     wx/filectrl.h
     wx/filehistory.h
diff --git a/build/msw/wx_base.vcxproj b/build/msw/wx_base.vcxproj
index 7f5a03c6d4..bdf09a2b7d 100644
--- a/build/msw/wx_base.vcxproj
+++ b/build/msw/wx_base.vcxproj
@@ -821,6 +821,7 @@
     <ClInclude Include="..\..\include\wx\thrimpl.cpp" />
     <ClInclude Include="..\..\include\wx\arrimpl.cpp" />
     <ClInclude Include="..\..\include\wx\secretstore.h" />
+    <ClInclude Include="..\..\include\wx\evtloopsrc.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/build/msw/wx_base.vcxproj.filters b/build/msw/wx_base.vcxproj.filters
index b2a36fd44b..6e1b1cace5 100644
--- a/build/msw/wx_base.vcxproj.filters
+++ b/build/msw/wx_base.vcxproj.filters
@@ -499,6 +499,9 @@
     <ClInclude Include="..\..\include\wx\evtloop.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\wx\evtloopsrc.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\wx\except.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
diff --git a/build/msw/wx_core.vcxproj b/build/msw/wx_core.vcxproj
index 40cf55da63..174b3d06f7 100644
--- a/build/msw/wx_core.vcxproj
+++ b/build/msw/wx_core.vcxproj
@@ -1235,7 +1235,6 @@
     <ClInclude Include="..\..\include\wx\dragimag.h" />
     <ClInclude Include="..\..\include\wx\effects.h" />
     <ClInclude Include="..\..\include\wx\encinfo.h" />
-    <ClInclude Include="..\..\include\wx\evtloopsrc.h" />
     <ClInclude Include="..\..\include\wx\fdrepdlg.h" />
     <ClInclude Include="..\..\include\wx\filectrl.h" />
     <ClInclude Include="..\..\include\wx\filedlg.h" />
diff --git a/build/msw/wx_core.vcxproj.filters b/build/msw/wx_core.vcxproj.filters
index d8057768a5..3d054e9e26 100644
--- a/build/msw/wx_core.vcxproj.filters
+++ b/build/msw/wx_core.vcxproj.filters
@@ -1090,9 +1090,6 @@
     <ClInclude Include="..\..\include\wx\encinfo.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\wx\evtloopsrc.h">
-      <Filter>Common Headers</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\include\wx\fdrepdlg.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
diff --git a/build/msw/wx_vc7_base.vcproj b/build/msw/wx_vc7_base.vcproj
index 3a48f12db1..22993e476a 100644
--- a/build/msw/wx_vc7_base.vcproj
+++ b/build/msw/wx_vc7_base.vcproj
@@ -1027,6 +1027,9 @@
 			<File
 				RelativePath="..\..\include\wx\evtloop.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\evtloopsrc.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\except.h">
 			</File>
diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj
index 2427c2944c..117b6efbc3 100644
--- a/build/msw/wx_vc7_core.vcproj
+++ b/build/msw/wx_vc7_core.vcproj
@@ -2147,9 +2147,6 @@
 			<File
 				RelativePath="..\..\include\wx\encinfo.h">
 			</File>
-			<File
-				RelativePath="..\..\include\wx\evtloopsrc.h">
-			</File>
 			<File
 				RelativePath="..\..\include\wx\fdrepdlg.h">
 			</File>
diff --git a/build/msw/wx_vc8_base.vcproj b/build/msw/wx_vc8_base.vcproj
index 88700558c6..d7bb2eb254 100644
--- a/build/msw/wx_vc8_base.vcproj
+++ b/build/msw/wx_vc8_base.vcproj
@@ -1967,6 +1967,10 @@
 				RelativePath="..\..\include\wx\evtloop.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\evtloopsrc.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\except.h"
 				>
diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj
index ec5944ffc8..d42bb1e612 100644
--- a/build/msw/wx_vc8_core.vcproj
+++ b/build/msw/wx_vc8_core.vcproj
@@ -3364,10 +3364,6 @@
 				RelativePath="..\..\include\wx\encinfo.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\include\wx\evtloopsrc.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\include\wx\fdrepdlg.h"
 				>
diff --git a/build/msw/wx_vc9_base.vcproj b/build/msw/wx_vc9_base.vcproj
index 9cecac72e4..ec52aebd6a 100644
--- a/build/msw/wx_vc9_base.vcproj
+++ b/build/msw/wx_vc9_base.vcproj
@@ -1963,6 +1963,10 @@
 				RelativePath="..\..\include\wx\evtloop.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\evtloopsrc.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\except.h"
 				>
diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj
index 09e025ae63..cb6cbf6566 100644
--- a/build/msw/wx_vc9_core.vcproj
+++ b/build/msw/wx_vc9_core.vcproj
@@ -3360,10 +3360,6 @@
 				RelativePath="..\..\include\wx\encinfo.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\include\wx\evtloopsrc.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\include\wx\fdrepdlg.h"
 				>