diff --git a/interface/wx/utils.h b/interface/wx/utils.h index 104eaccae9..4e83ce490f 100644 --- a/interface/wx/utils.h +++ b/interface/wx/utils.h @@ -917,7 +917,7 @@ wxString wxGetOsDescription(); numbers will have a value of -1. On systems where only the micro version can't be detected or doesn't make - sense such as Windows, it will have a value of 0. + sense, it will have a value of 0. For Unix-like systems (@c wxOS_UNIX) the major, minor, and micro version integers will contain the kernel's major, minor, and micro version @@ -928,24 +928,106 @@ wxString wxGetOsDescription(); natural version numbers associated with the OS; e.g. "10", "11" and "2" if the machine is using macOS El Capitan 10.11.2. - For Windows-like systems (@c wxOS_WINDOWS) the major and minor version integers will - contain the following values: - @beginTable - @row3col{Windows OS name, Major version, Minor version} - @row3col{Windows 10, 10, 0} - @row3col{Windows Server 2016, 10, 0} - @row3col{Windows 8.1, 6, 3} - @row3col{Windows Server 2012 R2, 6, 3} - @row3col{Windows 8, 6, 2} - @row3col{Windows Server 2012, 6, 2} - @row3col{Windows 7, 6, 1} - @row3col{Windows Server 2008 R2, 6, 1} - @row3col{Windows Server 2008, 6, 0} - @row3col{Windows Vista, 6, 0} - @row3col{Windows Server 2003 R2, 5, 2} - @row3col{Windows Server 2003, 5, 2} - @row3col{Windows XP, 5, 1} - @endDefList + For Windows-like systems (@c wxOS_WINDOWS) the major, minor and micro + (equal to the build number) version integers will contain the following values: +
Windows OS name | +Major version | +Minor version | +Build number | +
---|---|---|---|
Windows 11 | +10 | +0 | +>= 22000 | +
Windows Server 2022 | +10 | +0 | +>= 22000 | +
Windows 10 | +10 | +0 | ++ |
Windows Server 2016 | +10 | +0 | ++ |
Windows 8.1 | +6 | +3 | ++ |
Windows Server 2012 R2 | +6 | +3 | ++ |
Windows 8 | +6 | +2 | ++ |
Windows Server 2012 | +6 | +2 | ++ |
Windows 7 | +6 | +1 | ++ |
Windows 2008 R2 | +6 | +1 | ++ |
Windows Vista | +6 | +0 | ++ |
Windows Server 2008 | +6 | +0 | ++ |
Windows Server 2003 R2 | +5 | +2 | ++ |
Windows Server 2003 | +5 | +2 | ++ |
Windows XP | +5 | +1 | ++ |