From a2b37029341c0286f7e85ba026cccecc4415e890 Mon Sep 17 00:00:00 2001 From: Tim Kosse Date: Sat, 20 Dec 2014 10:15:51 +0000 Subject: [PATCH] Add Windows 10 support to wxGetOsDescription(). Map Windows 10 to wxWinVersion_8 in wxGetWinVersion() to not change ABI. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@78285 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/utils.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp index df4ec5ffd1..ed03dba770 100644 --- a/src/msw/utils.cpp +++ b/src/msw/utils.cpp @@ -1331,6 +1331,12 @@ wxString wxGetOsDescription() ? _("Windows Server 2012 R2") : _("Windows 8.1"); break; + + case 4: + str = wxIsWindowsServer() == 1 + ? _("Windows Server 10") + : _("Windows 10"); + break; } break; } @@ -1490,8 +1496,9 @@ wxWinVersion wxGetWinVersion() return wxWinVersion_8; case 3: + case 4: // For now, map to wxWinVersion_8. In case program - // does not have a manifest indicating 8.1 + // does not have a manifest indicating 8.1 or 10 // support, Windows already performs this mapping // for us. return wxWinVersion_8;