Remove WXWIN_OS_DESCRIPTION.

This constant wasn't very useful as it contained the description of the OS on
the machine where the library was built, not the one on which the application
using it was running. It also wasn't used anywhere in wxWidgets and apparently
wasn't meant to be used outside of it.

Finally, putting the output of `uname -r` into it created problems with
creating reproducible builds as just a change in the kernel version changed
the build results.

Closes #17002.

configure

@@ -37242,19 +37242,6 @@ $as_echo "$as_me: WARNING: GStreamer not available... disabling wxMediaCtrl" >&2
 fi
 
 
-if test "$cross_compiling" != "no"; then
-        OSINFO="\"$host\""
-else
-        OSINFO=`uname -s -r -m`
-    OSINFO="\"$OSINFO\""
-fi
-
-cat >>confdefs.h <<_ACEOF
-#define WXWIN_OS_DESCRIPTION $OSINFO
-_ACEOF
-
-
-
 if test "x$prefix" != "xNONE"; then
     wxPREFIX=$prefix
 else

configure.in

@@ -7395,21 +7395,6 @@ if test "$wxUSE_MEDIACTRL" = "yes" -o "$wxUSE_MEDIACTRL" = "auto"; then
     fi
 fi
 
-dnl ---------------------------------------------------------------------------
-dnl get the string with OS info - used by wxGetOsDescription() on MacOS X
-dnl ---------------------------------------------------------------------------
-
-if test "$cross_compiling" != "no"; then
-    dnl Use best guess from host as we can't use uname when cross compiling
-    OSINFO="\"$host\""
-else
-    dnl attualy work out OS version
-    OSINFO=`uname -s -r -m`
-    OSINFO="\"$OSINFO\""
-fi
-
-AC_DEFINE_UNQUOTED(WXWIN_OS_DESCRIPTION, $OSINFO)
-
 dnl ---------------------------------------------------------------------------
 dnl define the variable containing the installation prefix (used in dcpsg.cpp)
 dnl ---------------------------------------------------------------------------

docs/changes.txt

@@ -33,6 +33,8 @@ Changes in behaviour which may result in build errors
 - "webview" library is not included in `wx-config --libs` output any more, you
   need to request it explicitly, e.g. `wx-config --libs std,webview`.
 
+- WXWIN_OS_DESCRIPTION doesn't exist any longer, use wxGetOsDescription().
+
 
 3.1.0: (released 2015-xx-xx)
 ----------------------------

include/wx/osx/config_xcode.h

@@ -122,7 +122,6 @@
 #define HAVE_LOCALE_T 1
 #define wxHAS_KQUEUE 1
 
-#define WXWIN_OS_DESCRIPTION "Darwin 7.9.0 Power Macintosh"
 #define PACKAGE_BUGREPORT "wx-dev@lists.wxwidgets.org"
 #define PACKAGE_NAME "wxWidgets"
 #define PACKAGE_STRING "wxWidgets 3.1.0"

samples/minimal/makefile.mic

@@ -29,7 +29,7 @@ include $(CONFIG)
 # Directories list for header files
 INCLUDEDIRS += -I$(WXDIR)/include
 # Defines for preprocessor
-DEFINES += -DMWIN -D__WXMSW__ -D__WXMICROWIN__ -D__WXUNIVERSAL__ -D__WIN32__ -D__WIN95__ -DHAVE_BOOL -DMICROWIN_TODO=1 -D__UNIX__ -DHAVE_NANOSLEEP -DMICROWIN_NOCONTROLS -D__WXDEBUG__ -DwxSIZE_T_IS_UINT -DWXWIN_OS_DESCRIPTION="\"MicroWindows\""
+DEFINES += -DMWIN -D__WXMSW__ -D__WXMICROWIN__ -D__WXUNIVERSAL__ -D__WIN32__ -D__WIN95__ -DHAVE_BOOL -DMICROWIN_TODO=1 -D__UNIX__ -DHAVE_NANOSLEEP -DMICROWIN_NOCONTROLS -D__WXDEBUG__ -DwxSIZE_T_IS_UINT
 
 # Compilation flags for C files OTHER than include directories
 CFLAGS +=

samples/widgets/makefile.mic

@@ -30,7 +30,7 @@ include $(CONFIG)
 # Directories list for header files
 INCLUDEDIRS += -I$(WXDIR)/include
 # Defines for preprocessor
-DEFINES += -DMWIN -D__WXMSW__ -D__WXMICROWIN__ -D__WXUNIVERSAL__ -D__WIN32__ -D__WIN95__ -DHAVE_BOOL -DMICROWIN_TODO=1 -D__UNIX__ -DHAVE_NANOSLEEP -DMICROWIN_NOCONTROLS -D__WXDEBUG__ -DwxSIZE_T_IS_UINT -DWXWIN_OS_DESCRIPTION="\"MicroWindows\""
+DEFINES += -DMWIN -D__WXMSW__ -D__WXMICROWIN__ -D__WXUNIVERSAL__ -D__WIN32__ -D__WIN95__ -DHAVE_BOOL -DMICROWIN_TODO=1 -D__UNIX__ -DHAVE_NANOSLEEP -DMICROWIN_NOCONTROLS -D__WXDEBUG__ -DwxSIZE_T_IS_UINT
 
 # Compilation flags for C files OTHER than include directories
 CFLAGS +=

setup.h.in

@@ -14,9 +14,6 @@
 
 #endif /* __cplusplus */
 
-/* fill in with the string wxGetOsDescription() will return */
-#undef WXWIN_OS_DESCRIPTION
-
 /* the installation location prefix from configure */
 #undef wxINSTALL_PREFIX
 

setup.h_vms

@@ -30,9 +30,6 @@
 
 #endif /* __cplusplus */
 
-/* fill in with the string wxGetOsDescription() will return */
-#define WXWIN_OS_DESCRIPTION "OpenVMS"
-
 /* the installation location prefix from configure */
 #undef wxINSTALL_PREFIX
 

src/x11/makefile.unx

@@ -274,7 +274,7 @@ include $(CONFIG)
 # Directories list for header files
 INCLUDEDIRS += -I$(WXDIR)/include
 # Defines for preprocessor
-DEFINES += -DMWIN -D__WXMSW__ -D__WXMICROWIN__ -D__WXUNIVERSAL__ -D__WIN32__ -D__WIN95__ -DHAVE_BOOL -DMICROWIN_TODO=1 -D__UNIX__ -DHAVE_NANOSLEEP -DMICROWIN_NOCONTROLS -D__WXDEBUG__ -DwxSIZE_T_IS_UINT -DWXWIN_OS_DESCRIPTION="\"MicroWindows\""
+DEFINES += -DMWIN -D__WXMSW__ -D__WXMICROWIN__ -D__WXUNIVERSAL__ -D__WIN32__ -D__WIN95__ -DHAVE_BOOL -DMICROWIN_TODO=1 -D__UNIX__ -DHAVE_NANOSLEEP -DMICROWIN_NOCONTROLS -D__WXDEBUG__ -DwxSIZE_T_IS_UINT
 
 # Compilation flags for C files OTHER than include directories
 CFLAGS +=