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.
This commit is contained in:
Mart Raudsepp
2018-01-04 16:12:15 +02:00
committed by Vadim Zeitlin
parent 5efba4ce47
commit 48a5d6c5f8
13 changed files with 19 additions and 18 deletions

View File

@@ -406,6 +406,7 @@ ALL_BASE_HEADERS = \
wx/event.h \ wx/event.h \
wx/eventfilter.h \ wx/eventfilter.h \
wx/evtloop.h \ wx/evtloop.h \
wx/evtloopsrc.h \
wx/except.h \ wx/except.h \
wx/features.h \ wx/features.h \
wx/flags.h \ wx/flags.h \
@@ -588,6 +589,7 @@ ALL_PORTS_BASE_HEADERS = \
wx/event.h \ wx/event.h \
wx/eventfilter.h \ wx/eventfilter.h \
wx/evtloop.h \ wx/evtloop.h \
wx/evtloopsrc.h \
wx/except.h \ wx/except.h \
wx/features.h \ wx/features.h \
wx/flags.h \ wx/flags.h \
@@ -3920,7 +3922,6 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \
wx/docmdi.h \ wx/docmdi.h \
wx/docview.h \ wx/docview.h \
wx/effects.h \ wx/effects.h \
wx/evtloopsrc.h \
wx/fdrepdlg.h \ wx/fdrepdlg.h \
wx/filectrl.h \ wx/filectrl.h \
wx/filehistory.h \ wx/filehistory.h \

View File

@@ -595,6 +595,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/event.h wx/event.h
wx/eventfilter.h wx/eventfilter.h
wx/evtloop.h wx/evtloop.h
wx/evtloopsrc.h
wx/except.h wx/except.h
wx/features.h wx/features.h
wx/flags.h wx/flags.h
@@ -1101,7 +1102,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/docmdi.h wx/docmdi.h
wx/docview.h wx/docview.h
wx/effects.h wx/effects.h
wx/evtloopsrc.h
wx/fdrepdlg.h wx/fdrepdlg.h
wx/filectrl.h wx/filectrl.h
wx/filehistory.h wx/filehistory.h

View File

@@ -526,6 +526,7 @@ BASE_CMN_HDR =
wx/event.h wx/event.h
wx/eventfilter.h wx/eventfilter.h
wx/evtloop.h wx/evtloop.h
wx/evtloopsrc.h
wx/except.h wx/except.h
wx/features.h wx/features.h
wx/flags.h wx/flags.h
@@ -1021,7 +1022,6 @@ GUI_CMN_HDR =
wx/docmdi.h wx/docmdi.h
wx/docview.h wx/docview.h
wx/effects.h wx/effects.h
wx/evtloopsrc.h
wx/fdrepdlg.h wx/fdrepdlg.h
wx/filectrl.h wx/filectrl.h
wx/filehistory.h wx/filehistory.h

View File

@@ -821,6 +821,7 @@
<ClInclude Include="..\..\include\wx\thrimpl.cpp" /> <ClInclude Include="..\..\include\wx\thrimpl.cpp" />
<ClInclude Include="..\..\include\wx\arrimpl.cpp" /> <ClInclude Include="..\..\include\wx\arrimpl.cpp" />
<ClInclude Include="..\..\include\wx\secretstore.h" /> <ClInclude Include="..\..\include\wx\secretstore.h" />
<ClInclude Include="..\..\include\wx\evtloopsrc.h" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">

View File

@@ -499,6 +499,9 @@
<ClInclude Include="..\..\include\wx\evtloop.h"> <ClInclude Include="..\..\include\wx\evtloop.h">
<Filter>Common Headers</Filter> <Filter>Common Headers</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\include\wx\evtloopsrc.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\except.h"> <ClInclude Include="..\..\include\wx\except.h">
<Filter>Common Headers</Filter> <Filter>Common Headers</Filter>
</ClInclude> </ClInclude>

View File

@@ -1235,7 +1235,6 @@
<ClInclude Include="..\..\include\wx\dragimag.h" /> <ClInclude Include="..\..\include\wx\dragimag.h" />
<ClInclude Include="..\..\include\wx\effects.h" /> <ClInclude Include="..\..\include\wx\effects.h" />
<ClInclude Include="..\..\include\wx\encinfo.h" /> <ClInclude Include="..\..\include\wx\encinfo.h" />
<ClInclude Include="..\..\include\wx\evtloopsrc.h" />
<ClInclude Include="..\..\include\wx\fdrepdlg.h" /> <ClInclude Include="..\..\include\wx\fdrepdlg.h" />
<ClInclude Include="..\..\include\wx\filectrl.h" /> <ClInclude Include="..\..\include\wx\filectrl.h" />
<ClInclude Include="..\..\include\wx\filedlg.h" /> <ClInclude Include="..\..\include\wx\filedlg.h" />

View File

@@ -1090,9 +1090,6 @@
<ClInclude Include="..\..\include\wx\encinfo.h"> <ClInclude Include="..\..\include\wx\encinfo.h">
<Filter>Common Headers</Filter> <Filter>Common Headers</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\include\wx\evtloopsrc.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\fdrepdlg.h"> <ClInclude Include="..\..\include\wx\fdrepdlg.h">
<Filter>Common Headers</Filter> <Filter>Common Headers</Filter>
</ClInclude> </ClInclude>

View File

@@ -1027,6 +1027,9 @@
<File <File
RelativePath="..\..\include\wx\evtloop.h"> RelativePath="..\..\include\wx\evtloop.h">
</File> </File>
<File
RelativePath="..\..\include\wx\evtloopsrc.h">
</File>
<File <File
RelativePath="..\..\include\wx\except.h"> RelativePath="..\..\include\wx\except.h">
</File> </File>

View File

@@ -2147,9 +2147,6 @@
<File <File
RelativePath="..\..\include\wx\encinfo.h"> RelativePath="..\..\include\wx\encinfo.h">
</File> </File>
<File
RelativePath="..\..\include\wx\evtloopsrc.h">
</File>
<File <File
RelativePath="..\..\include\wx\fdrepdlg.h"> RelativePath="..\..\include\wx\fdrepdlg.h">
</File> </File>

View File

@@ -1967,6 +1967,10 @@
RelativePath="..\..\include\wx\evtloop.h" RelativePath="..\..\include\wx\evtloop.h"
> >
</File> </File>
<File
RelativePath="..\..\include\wx\evtloopsrc.h"
>
</File>
<File <File
RelativePath="..\..\include\wx\except.h" RelativePath="..\..\include\wx\except.h"
> >

View File

@@ -3364,10 +3364,6 @@
RelativePath="..\..\include\wx\encinfo.h" RelativePath="..\..\include\wx\encinfo.h"
> >
</File> </File>
<File
RelativePath="..\..\include\wx\evtloopsrc.h"
>
</File>
<File <File
RelativePath="..\..\include\wx\fdrepdlg.h" RelativePath="..\..\include\wx\fdrepdlg.h"
> >

View File

@@ -1963,6 +1963,10 @@
RelativePath="..\..\include\wx\evtloop.h" RelativePath="..\..\include\wx\evtloop.h"
> >
</File> </File>
<File
RelativePath="..\..\include\wx\evtloopsrc.h"
>
</File>
<File <File
RelativePath="..\..\include\wx\except.h" RelativePath="..\..\include\wx\except.h"
> >

View File

@@ -3360,10 +3360,6 @@
RelativePath="..\..\include\wx\encinfo.h" RelativePath="..\..\include\wx\encinfo.h"
> >
</File> </File>
<File
RelativePath="..\..\include\wx\evtloopsrc.h"
>
</File>
<File <File
RelativePath="..\..\include\wx\fdrepdlg.h" RelativePath="..\..\include\wx\fdrepdlg.h"
> >