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

Add wxUSE_WEBREQUEST preprocessor constant

Browse Source
This commit is contained in:
Tobias Taschner
2018-10-17 21:33:17 +02:00
parent 30d56ec5b7
commit 2c8fcf2584
13 changed files with 96 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/cmake/setup.h.in
View File

@@ -299,6 +299,8 @@
#cmakedefine01 wxUSE_MIMETYPE #cmakedefine01 wxUSE_MIMETYPE
#cmakedefine01 wxUSE_WEBREQUEST
#cmakedefine01 wxUSE_PROTOCOL #cmakedefine01 wxUSE_PROTOCOL
#cmakedefine01 wxUSE_PROTOCOL_FILE #cmakedefine01 wxUSE_PROTOCOL_FILE

36
configure vendored
View File

@@ -1137,6 +1137,7 @@ enable_sockets
enable_ipv6 enable_ipv6
enable_ole enable_ole
enable_dataobj enable_dataobj
enable_webrequest
enable_ipc enable_ipc
enable_baseevtloop enable_baseevtloop
enable_epollloop enable_epollloop
@@ -2078,6 +2079,7 @@ Optional Features:
--enable-ipv6 enable IPv6 support in wxSocket --enable-ipv6 enable IPv6 support in wxSocket
--enable-ole use OLE classes (Win32 only) --enable-ole use OLE classes (Win32 only)
--enable-dataobj use data object classes --enable-dataobj use data object classes
--enable-webrequest use wxWebRequest
--enable-ipc use interprocess communication (wxSocket etc.) --enable-ipc use interprocess communication (wxSocket etc.)
--enable-baseevtloop use event loop in console programs too --enable-baseevtloop use event loop in console programs too
--enable-epollloop use wxEpollDispatcher class (Linux only) --enable-epollloop use wxEpollDispatcher class (Linux only)
@@ -6517,6 +6519,35 @@ fi
eval "$wx_cv_use_dataobj" 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= enablestring=
defaultval=$wxUSE_ALL_FEATURES defaultval=$wxUSE_ALL_FEATURES
@@ -36553,6 +36584,11 @@ if test "$wxUSE_FS_INET" = "yes"; then
fi 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 if test "$wxUSE_GUI" = "yes" -a "$wxUSE_JOYSTICK" = "yes"; then
wxUSE_JOYSTICK=no wxUSE_JOYSTICK=no

5
configure.in
View File

@@ -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(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(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(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) 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) AC_DEFINE(wxUSE_FS_INET)
fi fi
if test "$wxUSE_WEBREQUEST" = "yes"; then
AC_DEFINE(wxUSE_WEBREQUEST)
fi
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl Joystick support dnl Joystick support
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------

1
docs/doxygen/mainpages/const_wxusedef.h
View File

@@ -253,6 +253,7 @@ library:
@itemdef{wxUSE_URL_NATIVE, Use native support for some operations with wxURL.} @itemdef{wxUSE_URL_NATIVE, Use native support for some operations with wxURL.}
@itemdef{wxUSE_VALIDATORS, Use wxValidator class.} @itemdef{wxUSE_VALIDATORS, Use wxValidator class.}
@itemdef{wxUSE_VARIANT, Use wxVariant class.} @itemdef{wxUSE_VARIANT, Use wxVariant class.}
@itemdef{wxUSE_WEBREQUEST, Use wxWebRequest class.}
@itemdef{wxUSE_WEBVIEW, Use wxWebView class.} @itemdef{wxUSE_WEBVIEW, Use wxWebView class.}
@itemdef{wxUSE_WIZARDDLG, Use wxWizard class.} @itemdef{wxUSE_WIZARDDLG, Use wxWizard class.}
@itemdef{wxUSE_WXHTML_HELP, Use wxHtmlHelpController and related classes.} @itemdef{wxUSE_WXHTML_HELP, Use wxHtmlHelpController and related classes.}

6
include/wx/android/setup.h
View File

@@ -647,6 +647,12 @@
// wxMimeTypesManager class // wxMimeTypesManager class
#define wxUSE_MIMETYPE 1 #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 // wxProtocol and related classes: if you want to use either of wxFTP, wxHTTP
// or wxURL you need to set this to 1. // or wxURL you need to set this to 1.
// //

8
include/wx/chkconf.h
View File

@@ -1231,6 +1231,14 @@
# endif # endif
#endif /* !defined(wxUSE_VALIDATORS) */ #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 #ifndef wxUSE_WEBVIEW
# ifdef wxABORT_ON_CONFIG_ERROR # ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_WEBVIEW must be defined, please read comment near the top of this file." # error "wxUSE_WEBVIEW must be defined, please read comment near the top of this file."

6
include/wx/gtk/setup0.h
View File

@@ -648,6 +648,12 @@
// wxMimeTypesManager class // wxMimeTypesManager class
#define wxUSE_MIMETYPE 1 #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 // wxProtocol and related classes: if you want to use either of wxFTP, wxHTTP
// or wxURL you need to set this to 1. // or wxURL you need to set this to 1.
// //

6
include/wx/motif/setup0.h
View File

@@ -648,6 +648,12 @@
// wxMimeTypesManager class // wxMimeTypesManager class
#define wxUSE_MIMETYPE 1 #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 // wxProtocol and related classes: if you want to use either of wxFTP, wxHTTP
// or wxURL you need to set this to 1. // or wxURL you need to set this to 1.
// //

6
include/wx/msw/setup0.h
View File

@@ -648,6 +648,12 @@
// wxMimeTypesManager class // wxMimeTypesManager class
#define wxUSE_MIMETYPE 1 #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 // wxProtocol and related classes: if you want to use either of wxFTP, wxHTTP
// or wxURL you need to set this to 1. // or wxURL you need to set this to 1.
// //

6
include/wx/osx/setup0.h
View File

@@ -654,6 +654,12 @@
// wxMimeTypesManager class // wxMimeTypesManager class
#define wxUSE_MIMETYPE 1 #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 // wxProtocol and related classes: if you want to use either of wxFTP, wxHTTP
// or wxURL you need to set this to 1. // or wxURL you need to set this to 1.
// //

6
include/wx/setup_inc.h
View File

@@ -644,6 +644,12 @@
// wxMimeTypesManager class // wxMimeTypesManager class
#define wxUSE_MIMETYPE 1 #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 // wxProtocol and related classes: if you want to use either of wxFTP, wxHTTP
// or wxURL you need to set this to 1. // or wxURL you need to set this to 1.
// //

6
include/wx/univ/setup0.h
View File

@@ -647,6 +647,12 @@
// wxMimeTypesManager class // wxMimeTypesManager class
#define wxUSE_MIMETYPE 1 #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 // wxProtocol and related classes: if you want to use either of wxFTP, wxHTTP
// or wxURL you need to set this to 1. // or wxURL you need to set this to 1.
// //

2
setup.h.in
View File

@@ -299,6 +299,8 @@
#define wxUSE_MIMETYPE 0 #define wxUSE_MIMETYPE 0
#define wxUSE_WEBREQUEST 0
#define wxUSE_PROTOCOL 0 #define wxUSE_PROTOCOL 0
#define wxUSE_PROTOCOL_FILE 0 #define wxUSE_PROTOCOL_FILE 0