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

Remove dependency of wxUSE_SOCKETS on wxUSE_STOPWATCH

Browse source 
It isn't actually needed, so don't check for it in wx/chkconf.h and
remove the comment claiming that it is from various setup.h files.

Closes #23609.
This commit is contained in:
Brian Nixon 2023-06-05 09:39:59 +01:00 • committed by Vadim Zeitlin
parent b9d0541f9a
commit 567a66aac2
7 changed files with 6 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/wx/android/setup.h
View file

@ -439,7 +439,7 @@
//
// Default is 1
//
// Recommended setting: 1 (needed by wxSocket)
// Recommended setting: 1
#define wxUSE_STOPWATCH 1
// Set wxUSE_FSWATCHER to 1 if you want to enable wxFileSystemWatcher

9
include/wx/chkconf.h
View file

@ -2212,15 +2212,6 @@
# endif
#endif /* wxUSE_XRC */
#if wxUSE_SOCKETS && !wxUSE_STOPWATCH
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_SOCKETS requires wxUSE_STOPWATCH"
# else
# undef wxUSE_SOCKETS
# define wxUSE_SOCKETS 0
# endif
#endif /* wxUSE_SOCKETS */
#if wxUSE_SVG && !wxUSE_STREAMS
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_SVG requires wxUSE_STREAMS"

2
include/wx/gtk/setup.h
View file

@ -440,7 +440,7 @@
//
// Default is 1
//
// Recommended setting: 1 (needed by wxSocket)
// Recommended setting: 1
#define wxUSE_STOPWATCH 1
// Set wxUSE_FSWATCHER to 1 if you want to enable wxFileSystemWatcher

2
include/wx/msw/setup.h
View file

@ -440,7 +440,7 @@
//
// Default is 1
//
// Recommended setting: 1 (needed by wxSocket)
// Recommended setting: 1
#define wxUSE_STOPWATCH 1
// Set wxUSE_FSWATCHER to 1 if you want to enable wxFileSystemWatcher

2
include/wx/osx/setup.h
View file

@ -446,7 +446,7 @@
//
// Default is 1
//
// Recommended setting: 1 (needed by wxSocket)
// Recommended setting: 1
#define wxUSE_STOPWATCH 1
// Set wxUSE_FSWATCHER to 1 if you want to enable wxFileSystemWatcher

2
include/wx/setup_inc.h
View file

@ -436,7 +436,7 @@
//
// Default is 1
//
// Recommended setting: 1 (needed by wxSocket)
// Recommended setting: 1
#define wxUSE_STOPWATCH 1
// Set wxUSE_FSWATCHER to 1 if you want to enable wxFileSystemWatcher

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

@ -439,7 +439,7 @@
//
// Default is 1
//
// Recommended setting: 1 (needed by wxSocket)
// Recommended setting: 1
#define wxUSE_STOPWATCH 1
// Set wxUSE_FSWATCHER to 1 if you want to enable wxFileSystemWatcher