diff --git a/include/wx/android/setup.h b/include/wx/android/setup.h
index be40c0ad30..0443cf7f9e 100644
--- a/include/wx/android/setup.h
+++ b/include/wx/android/setup.h
@@ -658,11 +658,12 @@
 #define wxUSE_WEBREQUEST_URLSESSION 0
 #endif
 
-// wxWebRequest backend based on NSURLSession
+// wxWebRequest backend based on libcurl, can be used under all platforms.
 //
 // Default is 1
 //
-// Recommended setting: 0 on Windows and macOS otherwise 1
+// Recommended setting: 0 on Windows and macOS, otherwise 1 as it is required
+// for wxWebRequest to be available at all.
 #if defined(__WINDOWS__) || defined(__APPLE__)
 #define wxUSE_WEBREQUEST_CURL 0
 #else
@@ -1437,7 +1438,8 @@
 #define wxUSE_GLCANVAS       1
 
 // Setting wxUSE_GLCANVAS_EGL to 1 enables OpenGL EGL backend. This will be
-// automatically enabled if EGL support is detected.
+// automatically enabled if EGL support is detected.  EGL support is only
+// available under Unix platforms.
 //
 // Default is 0.
 //
diff --git a/include/wx/gtk/setup0.h b/include/wx/gtk/setup0.h
index 5731813bec..d22b87749a 100644
--- a/include/wx/gtk/setup0.h
+++ b/include/wx/gtk/setup0.h
@@ -659,11 +659,12 @@
 #define wxUSE_WEBREQUEST_URLSESSION 0
 #endif
 
-// wxWebRequest backend based on NSURLSession
+// wxWebRequest backend based on libcurl, can be used under all platforms.
 //
 // Default is 1
 //
-// Recommended setting: 0 on Windows and macOS otherwise 1
+// Recommended setting: 0 on Windows and macOS, otherwise 1 as it is required
+// for wxWebRequest to be available at all.
 #if defined(__WINDOWS__) || defined(__APPLE__)
 #define wxUSE_WEBREQUEST_CURL 0
 #else
@@ -1438,7 +1439,8 @@
 #define wxUSE_GLCANVAS       1
 
 // Setting wxUSE_GLCANVAS_EGL to 1 enables OpenGL EGL backend. This will be
-// automatically enabled if EGL support is detected.
+// automatically enabled if EGL support is detected.  EGL support is only
+// available under Unix platforms.
 //
 // Default is 0.
 //
diff --git a/include/wx/motif/setup0.h b/include/wx/motif/setup0.h
index 4bbd0fb723..f88c0fefb7 100644
--- a/include/wx/motif/setup0.h
+++ b/include/wx/motif/setup0.h
@@ -659,11 +659,12 @@
 #define wxUSE_WEBREQUEST_URLSESSION 0
 #endif
 
-// wxWebRequest backend based on NSURLSession
+// wxWebRequest backend based on libcurl, can be used under all platforms.
 //
 // Default is 1
 //
-// Recommended setting: 0 on Windows and macOS otherwise 1
+// Recommended setting: 0 on Windows and macOS, otherwise 1 as it is required
+// for wxWebRequest to be available at all.
 #if defined(__WINDOWS__) || defined(__APPLE__)
 #define wxUSE_WEBREQUEST_CURL 0
 #else
@@ -1438,7 +1439,8 @@
 #define wxUSE_GLCANVAS       1
 
 // Setting wxUSE_GLCANVAS_EGL to 1 enables OpenGL EGL backend. This will be
-// automatically enabled if EGL support is detected.
+// automatically enabled if EGL support is detected.  EGL support is only
+// available under Unix platforms.
 //
 // Default is 0.
 //
diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index 104e122964..ed9a9e5072 100644
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -659,11 +659,12 @@
 #define wxUSE_WEBREQUEST_URLSESSION 0
 #endif
 
-// wxWebRequest backend based on NSURLSession
+// wxWebRequest backend based on libcurl, can be used under all platforms.
 //
 // Default is 1
 //
-// Recommended setting: 0 on Windows and macOS otherwise 1
+// Recommended setting: 0 on Windows and macOS, otherwise 1 as it is required
+// for wxWebRequest to be available at all.
 #if defined(__WINDOWS__) || defined(__APPLE__)
 #define wxUSE_WEBREQUEST_CURL 0
 #else
@@ -1438,7 +1439,8 @@
 #define wxUSE_GLCANVAS       1
 
 // Setting wxUSE_GLCANVAS_EGL to 1 enables OpenGL EGL backend. This will be
-// automatically enabled if EGL support is detected.
+// automatically enabled if EGL support is detected.  EGL support is only
+// available under Unix platforms.
 //
 // Default is 0.
 //
diff --git a/include/wx/osx/setup0.h b/include/wx/osx/setup0.h
index 27dda7f942..ead9701e87 100644
--- a/include/wx/osx/setup0.h
+++ b/include/wx/osx/setup0.h
@@ -665,11 +665,12 @@
 #define wxUSE_WEBREQUEST_URLSESSION 0
 #endif
 
-// wxWebRequest backend based on NSURLSession
+// wxWebRequest backend based on libcurl, can be used under all platforms.
 //
 // Default is 1
 //
-// Recommended setting: 0 on Windows and macOS otherwise 1
+// Recommended setting: 0 on Windows and macOS, otherwise 1 as it is required
+// for wxWebRequest to be available at all.
 #if defined(__WINDOWS__) || defined(__APPLE__)
 #define wxUSE_WEBREQUEST_CURL 0
 #else
@@ -1444,7 +1445,8 @@
 #define wxUSE_GLCANVAS       1
 
 // Setting wxUSE_GLCANVAS_EGL to 1 enables OpenGL EGL backend. This will be
-// automatically enabled if EGL support is detected.
+// automatically enabled if EGL support is detected.  EGL support is only
+// available under Unix platforms.
 //
 // Default is 0.
 //
@@ -1685,6 +1687,13 @@
 // make sure we have the proper dispatcher for the console event loop
 #define wxUSE_SELECT_DISPATCHER 1
 #define wxUSE_EPOLL_DISPATCHER 0
+
+// set to 1 if you have older code that still needs icon refs
+#define wxOSX_USE_ICONREF 0
+
+// set to 0 if you have code that has problems with the new bitmap implementation
+#define wxOSX_BITMAP_NATIVE_ACCESS 1
+
 /* --- end OSX options --- */
 
 #endif
diff --git a/include/wx/setup_inc.h b/include/wx/setup_inc.h
index e847a0c8cb..1eb66bcaa6 100644
--- a/include/wx/setup_inc.h
+++ b/include/wx/setup_inc.h
@@ -655,11 +655,12 @@
 #define wxUSE_WEBREQUEST_URLSESSION 0
 #endif
 
-// wxWebRequest backend based on NSURLSession
+// wxWebRequest backend based on libcurl, can be used under all platforms.
 //
 // Default is 1
 //
-// Recommended setting: 0 on Windows and macOS otherwise 1
+// Recommended setting: 0 on Windows and macOS, otherwise 1 as it is required
+// for wxWebRequest to be available at all.
 #if defined(__WINDOWS__) || defined(__APPLE__)
 #define wxUSE_WEBREQUEST_CURL 0
 #else
diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h
index fdf8e562fe..9c057c2977 100644
--- a/include/wx/univ/setup0.h
+++ b/include/wx/univ/setup0.h
@@ -658,11 +658,12 @@
 #define wxUSE_WEBREQUEST_URLSESSION 0
 #endif
 
-// wxWebRequest backend based on NSURLSession
+// wxWebRequest backend based on libcurl, can be used under all platforms.
 //
 // Default is 1
 //
-// Recommended setting: 0 on Windows and macOS otherwise 1
+// Recommended setting: 0 on Windows and macOS, otherwise 1 as it is required
+// for wxWebRequest to be available at all.
 #if defined(__WINDOWS__) || defined(__APPLE__)
 #define wxUSE_WEBREQUEST_CURL 0
 #else
@@ -1437,7 +1438,8 @@
 #define wxUSE_GLCANVAS       1
 
 // Setting wxUSE_GLCANVAS_EGL to 1 enables OpenGL EGL backend. This will be
-// automatically enabled if EGL support is detected.
+// automatically enabled if EGL support is detected.  EGL support is only
+// available under Unix platforms.
 //
 // Default is 0.
 //