From f2bbf083c63bd10e08f35ffd21cfa2864028fae8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sat, 23 Nov 2013 15:10:57 +0000 Subject: [PATCH] Recognize Windows 8 and 8.1 in wxGetOsDescription(). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75281 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/utils.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp index 0610186a211f..59adbbe3cc0f 100644 --- a/src/msw/utils.cpp +++ b/src/msw/utils.cpp @@ -1301,6 +1301,18 @@ wxString wxGetOsDescription() ? _("Windows Server 2008 R2") : _("Windows 7"); break; + + case 2: + str = wxIsWindowsServer() == 1 + ? _("Windows Server 2012") + : _("Windows 8"); + break; + + case 3: + str = wxIsWindowsServer() == 1 + ? _("Windows Server 2012 R2") + : _("Windows 8.1"); + break; } break; }