Move backend-specific wxWebRequest headers to private subdirs

There is no need to make these headers public and keeping them private
will allow making backwards-incompatible changes to them in the future.

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 =  \

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
 </set>
 
 <!-- ====================================================================== -->

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

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)
 

build/msw/wx_net.vcxproj

@@ -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">

build/msw/wx_net.vcxproj.filters

@@ -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">

build/msw/wx_vc7_net.vcproj

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

build/msw/wx_vc8_net.vcproj

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

build/msw/wx_vc9_net.vcproj

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

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";

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"

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"

src/osx/webrequest_urlsession.mm

@@ -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