diff --git a/Makefile.in b/Makefile.in index fcc4b8ea56..4b27ee3aae 100644 --- a/Makefile.in +++ b/Makefile.in @@ -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 = \ diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 14234f140d..9e13a46f20 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -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 diff --git a/build/cmake/files.cmake b/build/cmake/files.cmake index bc6d240fa3..b9c3e24629 100644 --- a/build/cmake/files.cmake +++ b/build/cmake/files.cmake @@ -705,7 +705,6 @@ set(NET_CMN_HDR wx/socket.h wx/url.h wx/webrequest.h - wx/webrequest_curl.h ) set(QA_SRC diff --git a/build/files b/build/files index 27071d78f6..08a035fc4c 100644 --- a/build/files +++ b/build/files @@ -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) diff --git a/build/msw/wx_net.vcxproj b/build/msw/wx_net.vcxproj index 4c2eb69153..7f36d05990 100644 --- a/build/msw/wx_net.vcxproj +++ b/build/msw/wx_net.vcxproj @@ -513,8 +513,6 @@ - - diff --git a/build/msw/wx_net.vcxproj.filters b/build/msw/wx_net.vcxproj.filters index d7cf069b48..2300c44998 100644 --- a/build/msw/wx_net.vcxproj.filters +++ b/build/msw/wx_net.vcxproj.filters @@ -76,9 +76,6 @@ Common Headers - - MSW Headers - Common Headers @@ -112,9 +109,6 @@ Common Headers - - Common Headers - diff --git a/build/msw/wx_vc7_net.vcproj b/build/msw/wx_vc7_net.vcproj index 0f2c913610..4ba46bc2f9 100644 --- a/build/msw/wx_vc7_net.vcproj +++ b/build/msw/wx_vc7_net.vcproj @@ -497,9 +497,6 @@ - - diff --git a/build/msw/wx_vc8_net.vcproj b/build/msw/wx_vc8_net.vcproj index 86c44ff5c6..f6590e3b87 100644 --- a/build/msw/wx_vc8_net.vcproj +++ b/build/msw/wx_vc8_net.vcproj @@ -1165,10 +1165,6 @@ RelativePath="..\..\include\wx\webrequest.h" > - - diff --git a/build/msw/wx_vc9_net.vcproj b/build/msw/wx_vc9_net.vcproj index 3dad3b6e8a..65e461df65 100644 --- a/build/msw/wx_vc9_net.vcproj +++ b/build/msw/wx_vc9_net.vcproj @@ -1161,10 +1161,6 @@ RelativePath="..\..\include\wx\webrequest.h" > - - diff --git a/include/wx/msw/webrequest_winhttp.h b/include/wx/msw/private/webrequest_winhttp.h similarity index 100% rename from include/wx/msw/webrequest_winhttp.h rename to include/wx/msw/private/webrequest_winhttp.h diff --git a/include/wx/osx/webrequest_urlsession.h b/include/wx/osx/private/webrequest_urlsession.h similarity index 100% rename from include/wx/osx/webrequest_urlsession.h rename to include/wx/osx/private/webrequest_urlsession.h diff --git a/include/wx/webrequest_curl.h b/include/wx/private/webrequest_curl.h similarity index 100% rename from include/wx/webrequest_curl.h rename to include/wx/private/webrequest_curl.h diff --git a/src/common/webrequest.cpp b/src/common/webrequest.cpp index 27a425613d..ecd4e4d7b5 100644 --- a/src/common/webrequest.cpp +++ b/src/common/webrequest.cpp @@ -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"; diff --git a/src/common/webrequest_curl.cpp b/src/common/webrequest_curl.cpp index 7fe9a90ac5..68c2cff8b1 100644 --- a/src/common/webrequest_curl.cpp +++ b/src/common/webrequest_curl.cpp @@ -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" diff --git a/src/msw/webrequest_winhttp.cpp b/src/msw/webrequest_winhttp.cpp index baab5ce47b..86ef8fc003 100644 --- a/src/msw/webrequest_winhttp.cpp +++ b/src/msw/webrequest_winhttp.cpp @@ -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" diff --git a/src/osx/webrequest_urlsession.mm b/src/osx/webrequest_urlsession.mm index 85dc8b768e..b42b7f858f 100644 --- a/src/osx/webrequest_urlsession.mm +++ b/src/osx/webrequest_urlsession.mm @@ -16,7 +16,7 @@ #import -#include "wx/osx/webrequest_urlsession.h" +#include "wx/osx/private/webrequest_urlsession.h" #include "wx/osx/private.h" #ifndef WX_PRECOMP