diff --git a/build/cmake/setup.h.in b/build/cmake/setup.h.in index 8b3788591c..87c54ba807 100644 --- a/build/cmake/setup.h.in +++ b/build/cmake/setup.h.in @@ -299,6 +299,8 @@ #cmakedefine01 wxUSE_MIMETYPE +#cmakedefine01 wxUSE_WEBREQUEST + #cmakedefine01 wxUSE_PROTOCOL #cmakedefine01 wxUSE_PROTOCOL_FILE diff --git a/configure b/configure index 031ff5c97b..5fcda9185d 100755 --- a/configure +++ b/configure @@ -1137,6 +1137,7 @@ enable_sockets enable_ipv6 enable_ole enable_dataobj +enable_webrequest enable_ipc enable_baseevtloop enable_epollloop @@ -2078,6 +2079,7 @@ Optional Features: --enable-ipv6 enable IPv6 support in wxSocket --enable-ole use OLE classes (Win32 only) --enable-dataobj use data object classes + --enable-webrequest use wxWebRequest --enable-ipc use interprocess communication (wxSocket etc.) --enable-baseevtloop use event loop in console programs too --enable-epollloop use wxEpollDispatcher class (Linux only) @@ -6517,6 +6519,35 @@ fi eval "$wx_cv_use_dataobj" + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + # Check whether --enable-webrequest was given. +if test "${enable_webrequest+set}" = set; then : + enableval=$enable_webrequest; + if test "$enableval" = yes; then + wx_cv_use_webrequest='wxUSE_WEBREQUEST=yes' + else + wx_cv_use_webrequest='wxUSE_WEBREQUEST=no' + fi + +else + + wx_cv_use_webrequest='wxUSE_WEBREQUEST=${'DEFAULT_wxUSE_WEBREQUEST":-$defaultval}" + +fi + + + eval "$wx_cv_use_webrequest" + + enablestring= defaultval=$wxUSE_ALL_FEATURES @@ -36553,6 +36584,11 @@ if test "$wxUSE_FS_INET" = "yes"; then fi +if test "$wxUSE_WEBREQUEST" = "yes"; then + $as_echo "#define wxUSE_WEBREQUEST 1" >>confdefs.h + +fi + if test "$wxUSE_GUI" = "yes" -a "$wxUSE_JOYSTICK" = "yes"; then wxUSE_JOYSTICK=no diff --git a/configure.in b/configure.in index b2aadfa781..40fb6ab0e0 100644 --- a/configure.in +++ b/configure.in @@ -698,6 +698,7 @@ WX_ARG_FEATURE(sockets, [ --enable-sockets use socket/network clas WX_ARG_FEATURE(ipv6, [ --enable-ipv6 enable IPv6 support in wxSocket], wxUSE_IPV6) WX_ARG_FEATURE(ole, [ --enable-ole use OLE classes (Win32 only)], wxUSE_OLE) WX_ARG_FEATURE(dataobj, [ --enable-dataobj use data object classes], wxUSE_DATAOBJ) +WX_ARG_FEATURE(webrequest, [ --enable-webrequest use wxWebRequest], wxUSE_WEBREQUEST) WX_ARG_FEATURE(ipc, [ --enable-ipc use interprocess communication (wxSocket etc.)], wxUSE_IPC) @@ -6340,6 +6341,10 @@ if test "$wxUSE_FS_INET" = "yes"; then AC_DEFINE(wxUSE_FS_INET) fi +if test "$wxUSE_WEBREQUEST" = "yes"; then + AC_DEFINE(wxUSE_WEBREQUEST) +fi + dnl --------------------------------------------------------------------------- dnl Joystick support dnl --------------------------------------------------------------------------- diff --git a/docs/doxygen/mainpages/const_wxusedef.h b/docs/doxygen/mainpages/const_wxusedef.h index 9d52ed1821..c77c0cadae 100644 --- a/docs/doxygen/mainpages/const_wxusedef.h +++ b/docs/doxygen/mainpages/const_wxusedef.h @@ -253,6 +253,7 @@ library: @itemdef{wxUSE_URL_NATIVE, Use native support for some operations with wxURL.} @itemdef{wxUSE_VALIDATORS, Use wxValidator class.} @itemdef{wxUSE_VARIANT, Use wxVariant class.} +@itemdef{wxUSE_WEBREQUEST, Use wxWebRequest class.} @itemdef{wxUSE_WEBVIEW, Use wxWebView class.} @itemdef{wxUSE_WIZARDDLG, Use wxWizard class.} @itemdef{wxUSE_WXHTML_HELP, Use wxHtmlHelpController and related classes.} diff --git a/include/wx/android/setup.h b/include/wx/android/setup.h index ccc99e7ad0..272e381944 100644 --- a/include/wx/android/setup.h +++ b/include/wx/android/setup.h @@ -647,6 +647,12 @@ // wxMimeTypesManager class #define wxUSE_MIMETYPE 1 +// wxWebRequest and related classes: This will allow usage of system libraries +// for HTTP(S) requests +// +// Default is 1 +#define wxUSE_WEBREQUEST 1 + // wxProtocol and related classes: if you want to use either of wxFTP, wxHTTP // or wxURL you need to set this to 1. // diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h index 82bb132b8a..3a100bd3bf 100644 --- a/include/wx/chkconf.h +++ b/include/wx/chkconf.h @@ -1231,6 +1231,14 @@ # endif #endif /* !defined(wxUSE_VALIDATORS) */ +#ifndef wxUSE_WEBREQUEST +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_WEBREQUEST must be defined, please read comment near the top of this file." +# else +# define wxUSE_WEBREQUEST 0 +# endif +#endif /* !defined(wxUSE_WEBREQUEST) */ + #ifndef wxUSE_WEBVIEW # ifdef wxABORT_ON_CONFIG_ERROR # error "wxUSE_WEBVIEW must be defined, please read comment near the top of this file." diff --git a/include/wx/gtk/setup0.h b/include/wx/gtk/setup0.h index 22ee07b8d0..7bedbed0c4 100644 --- a/include/wx/gtk/setup0.h +++ b/include/wx/gtk/setup0.h @@ -648,6 +648,12 @@ // wxMimeTypesManager class #define wxUSE_MIMETYPE 1 +// wxWebRequest and related classes: This will allow usage of system libraries +// for HTTP(S) requests +// +// Default is 1 +#define wxUSE_WEBREQUEST 1 + // wxProtocol and related classes: if you want to use either of wxFTP, wxHTTP // or wxURL you need to set this to 1. // diff --git a/include/wx/motif/setup0.h b/include/wx/motif/setup0.h index fc4c657c01..bf71fa4aa3 100644 --- a/include/wx/motif/setup0.h +++ b/include/wx/motif/setup0.h @@ -648,6 +648,12 @@ // wxMimeTypesManager class #define wxUSE_MIMETYPE 1 +// wxWebRequest and related classes: This will allow usage of system libraries +// for HTTP(S) requests +// +// Default is 1 +#define wxUSE_WEBREQUEST 1 + // wxProtocol and related classes: if you want to use either of wxFTP, wxHTTP // or wxURL you need to set this to 1. // diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h index dcbb2d7fde..1b6b30d7a6 100644 --- a/include/wx/msw/setup0.h +++ b/include/wx/msw/setup0.h @@ -648,6 +648,12 @@ // wxMimeTypesManager class #define wxUSE_MIMETYPE 1 +// wxWebRequest and related classes: This will allow usage of system libraries +// for HTTP(S) requests +// +// Default is 1 +#define wxUSE_WEBREQUEST 1 + // wxProtocol and related classes: if you want to use either of wxFTP, wxHTTP // or wxURL you need to set this to 1. // diff --git a/include/wx/osx/setup0.h b/include/wx/osx/setup0.h index 49bf354be5..0b1849a279 100644 --- a/include/wx/osx/setup0.h +++ b/include/wx/osx/setup0.h @@ -654,6 +654,12 @@ // wxMimeTypesManager class #define wxUSE_MIMETYPE 1 +// wxWebRequest and related classes: This will allow usage of system libraries +// for HTTP(S) requests +// +// Default is 1 +#define wxUSE_WEBREQUEST 1 + // wxProtocol and related classes: if you want to use either of wxFTP, wxHTTP // or wxURL you need to set this to 1. // diff --git a/include/wx/setup_inc.h b/include/wx/setup_inc.h index bece6430b8..f8b9346a32 100644 --- a/include/wx/setup_inc.h +++ b/include/wx/setup_inc.h @@ -644,6 +644,12 @@ // wxMimeTypesManager class #define wxUSE_MIMETYPE 1 +// wxWebRequest and related classes: This will allow usage of system libraries +// for HTTP(S) requests +// +// Default is 1 +#define wxUSE_WEBREQUEST 1 + // wxProtocol and related classes: if you want to use either of wxFTP, wxHTTP // or wxURL you need to set this to 1. // diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h index 11c7277097..f540e5816d 100644 --- a/include/wx/univ/setup0.h +++ b/include/wx/univ/setup0.h @@ -647,6 +647,12 @@ // wxMimeTypesManager class #define wxUSE_MIMETYPE 1 +// wxWebRequest and related classes: This will allow usage of system libraries +// for HTTP(S) requests +// +// Default is 1 +#define wxUSE_WEBREQUEST 1 + // wxProtocol and related classes: if you want to use either of wxFTP, wxHTTP // or wxURL you need to set this to 1. // diff --git a/setup.h.in b/setup.h.in index 9f703405c1..48cf6734e7 100644 --- a/setup.h.in +++ b/setup.h.in @@ -299,6 +299,8 @@ #define wxUSE_MIMETYPE 0 +#define wxUSE_WEBREQUEST 0 + #define wxUSE_PROTOCOL 0 #define wxUSE_PROTOCOL_FILE 0