solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Update wxMSW-specific options in wxUniv setup.h

Browse source 
This section of the file wasn't updated when rerunning update-setup-h,
add the missing line to it and commit the results of rerunning it.
This commit is contained in:
Vadim Zeitlin 2022-10-09 19:03:28 +02:00
parent 824f7e63f2
commit 7ee8ea2d5b
2 changed files with 43 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
build/update-setup-h
View file

@ -124,6 +124,7 @@ update_msw_setup_h build/cmake/setup.h.in
update_osx_setup_h include/wx/osx/setup.h
update_single_setup_h wxUniv include/wx/univ/setup_inc.h include/wx/univ/setup.h
update_msw_setup_h include/wx/univ/setup.h
exit $rc

48
include/wx/univ/setup.h
View file

@ -1641,6 +1641,16 @@
#define wxUSE_GRAPHICS_DIRECT2D 0
#endif
// wxWebRequest backend based on WinHTTP.
//
// This is only taken into account if wxUSE_WEBREQUEST==1.
//
// Default is 1 if supported by the compiler (MSVS or MinGW64).
//
// Recommended setting: 1, can be set to 0 if wxUSE_WEBREQUEST_CURL==1,
// otherwise wxWebRequest won't be available at all.
#define wxUSE_WEBREQUEST_WINHTTP 1
// ----------------------------------------------------------------------------
// Windows-only settings
// ----------------------------------------------------------------------------
@ -1670,7 +1680,18 @@
// Recommended setting: 1, required by wxMediaCtrl
#define wxUSE_ACTIVEX 1
#define wxUSE_WINRT 0
// Enable WinRT support
//
// Default is 1 for compilers which support it, i.e. VS2012+ currently. If you
// use an earlier MSVC version or another compiler and installed the necessary
// SDK components manually, you need to change this setting.
//
// Recommended setting: 1
#if defined(_MSC_VER) && _MSC_VER >= 1700 && !defined(_USING_V110_SDK71_)
#define wxUSE_WINRT 1
#else
#define wxUSE_WINRT 0
#endif
// wxDC caching implementation
#define wxUSE_DC_CACHEING 1
@ -1728,7 +1749,14 @@
// Recommended setting: 1, set to 0 for a tiny library size reduction
#define wxUSE_TASKBARICON_BALLOONS 1
#define wxUSE_TASKBARBUTTON 0
// Set this to 1 to enable following functionality added in Windows 7: thumbnail
// representations, thumbnail toolbars, notification and status overlays,
// progress indicators and jump lists.
//
// Default is 1.
//
// Recommended setting: 1, set to 0 for a tiny library size reduction
#define wxUSE_TASKBARBUTTON 1
// Set to 1 to compile MS Windows XP theme engine support
#define wxUSE_UXTHEME 1
@ -1743,12 +1771,12 @@
// Recommended setting: 0, nobody uses .INI files any more
#define wxUSE_INICONF 0
// Set to 1 if you need to include <winsock2.h> over <winsock.h>
// Set to 0 if you need to include <winsock.h> rather than <winsock2.h>
//
// Default is 0.
// Default is 1.
//
// Recommended setting: 0
#define wxUSE_WINSOCK2 0
// Recommended setting: 1, required to be 1 if wxUSE_IPV6 is 1.
#define wxUSE_WINSOCK2 1
// ----------------------------------------------------------------------------
// Generic versions of native controls
@ -1762,6 +1790,14 @@
// Recommended setting: 0, this is mainly used for testing
#define wxUSE_DATEPICKCTRL_GENERIC 0
// Set this to 1 to be able to use wxTimePickerCtrlGeneric in addition to the
// native wxTimePickerCtrl for the platforms that have the latter (MSW).
//
// Default is 0.
//
// Recommended setting: 0, this is mainly used for testing
#define wxUSE_TIMEPICKCTRL_GENERIC 0
// ----------------------------------------------------------------------------
// Crash debugging helpers
// ----------------------------------------------------------------------------