Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move backend-specific wxWebRequest headers to private subdirs

Browse Source 
There is no need to make these headers public and keeping them private
will allow making backwards-incompatible changes to them in the future.
This commit is contained in:
Vadim Zeitlin
2020-12-26 17:00:07 +01:00
parent 8b632bb892
commit e5bd5a926c
16 changed files with 6 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.in
View File

@@ -567,7 +567,6 @@ ALL_BASE_HEADERS = \
wx/socket.h \
wx/url.h \
wx/webrequest.h \
wx/webrequest_curl.h \
wx/xml/xml.h \
wx/xtixml.h
ALL_HEADERS = \
@@ -788,7 +787,6 @@ ALL_PORTS_BASE_HEADERS = \
wx/socket.h \
wx/url.h \
wx/webrequest.h \
wx/webrequest_curl.h \
wx/xml/xml.h \
wx/xtixml.h
ALL_BASE_SOURCES = \

1
build/bakefiles/files.bkl
View File

@@ -789,7 +789,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/socket.h
wx/url.h
wx/webrequest.h
wx/webrequest_curl.h
</set>
<!-- ====================================================================== -->

1
build/cmake/files.cmake
View File

@@ -705,7 +705,6 @@ set(NET_CMN_HDR
wx/socket.h
wx/url.h
wx/webrequest.h
wx/webrequest_curl.h
)
set(QA_SRC

5
build/files
View File

@@ -679,15 +679,11 @@ NET_UNIX_SRC =
NET_OSX_SRC =
src/osx/core/sockosx.cpp
src/osx/webrequest_urlsession.mm
NET_OSX_HDR =
wx/osx/webrequest_urlsession.h
NET_WIN32_SRC =
src/msw/sockmsw.cpp
src/msw/urlmsw.cpp
src/msw/webrequest_winhttp.cpp
NET_WIN32_HDR =
wx/msw/webrequest_winhttp.h
NET_CMN_SRC =
src/common/fs_inet.cpp
@@ -715,7 +711,6 @@ NET_CMN_HDR =
wx/socket.h
wx/url.h
wx/webrequest.h
wx/webrequest_curl.h
# wxQA (non GUI library)

2
build/msw/wx_net.vcxproj
View File

@@ -513,8 +513,6 @@
<ClInclude Include="..\..\include\wx\socket.h" />
<ClInclude Include="..\..\include\wx\url.h" />
<ClInclude Include="..\..\include\wx\webrequest.h" />
<ClInclude Include="..\..\include\wx\msw\webrequest_winhttp.h" />
<ClInclude Include="..\..\include\wx\webrequest_curl.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

6
build/msw/wx_net.vcxproj.filters
View File

@@ -76,9 +76,6 @@
<ClInclude Include="..\..\include\wx\fs_inet.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\msw\webrequest_winhttp.h">
<Filter>MSW Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\protocol\file.h">
<Filter>Common Headers</Filter>
</ClInclude>
@@ -112,9 +109,6 @@
<ClInclude Include="..\..\include\wx\webrequest.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\webrequest_curl.h">
<Filter>Common Headers</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\..\include\wx\msw\setup.h">

3
build/msw/wx_vc7_net.vcproj
View File

@@ -497,9 +497,6 @@
<File
RelativePath="..\..\include\wx\webrequest.h">
</File>
<File
RelativePath="..\..\include\wx\webrequest_curl.h">
</File>
</Filter>
</Files>
<Globals>

4
build/msw/wx_vc8_net.vcproj
View File

@@ -1165,10 +1165,6 @@
RelativePath="..\..\include\wx\webrequest.h"
>
</File>
<File
RelativePath="..\..\include\wx\webrequest_curl.h"
>
</File>
</Filter>
</Files>
<Globals>

4
build/msw/wx_vc9_net.vcproj
View File

@@ -1161,10 +1161,6 @@
RelativePath="..\..\include\wx\webrequest.h"
>
</File>
<File
RelativePath="..\..\include\wx\webrequest_curl.h"
>
</File>
</Filter>
</Files>
<Globals>

0
include/wx/msw/webrequest_winhttp.h → include/wx/msw/private/webrequest_winhttp.h
View File

0
include/wx/osx/webrequest_urlsession.h → include/wx/osx/private/webrequest_urlsession.h
View File

0
include/wx/webrequest_curl.h → include/wx/private/webrequest_curl.h
View File

6
src/common/webrequest.cpp
View File

@@ -28,13 +28,13 @@
#endif
#if wxUSE_WEBREQUEST_WINHTTP
#include "wx/msw/webrequest_winhttp.h"
#include "wx/msw/private/webrequest_winhttp.h"
#endif
#if wxUSE_WEBREQUEST_URLSESSION
#include "wx/osx/webrequest_urlsession.h"
#include "wx/osx/private/webrequest_urlsession.h"
#endif
#if wxUSE_WEBREQUEST_CURL
#include "wx/webrequest_curl.h"
#include "wx/private/webrequest_curl.h"
#endif
extern WXDLLIMPEXP_DATA_NET(const char) wxWebSessionBackendWinHTTP[] = "wxWebSessionBackendWinHTTP";

2
src/common/webrequest_curl.cpp
View File

@@ -14,7 +14,7 @@
#if wxUSE_WEBREQUEST_CURL
#include "wx/webrequest_curl.h"
#include "wx/private/webrequest_curl.h"
#ifndef WX_PRECOMP
#include "wx/log.h"

2
src/msw/webrequest_winhttp.cpp
View File

@@ -16,7 +16,7 @@
#include "wx/mstream.h"
#include "wx/uri.h"
#include "wx/msw/webrequest_winhttp.h"
#include "wx/msw/private/webrequest_winhttp.h"
#ifndef WX_PRECOMP
#include "wx/log.h"

2
src/osx/webrequest_urlsession.mm
View File

@@ -16,7 +16,7 @@
#import <Foundation/Foundation.h>
#include "wx/osx/webrequest_urlsession.h"
#include "wx/osx/private/webrequest_urlsession.h"
#include "wx/osx/private.h"
#ifndef WX_PRECOMP