Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add Windows 10 support to wxGetOsDescription(). Map Windows 10 to wxWinVersion_8 in wxGetWinVersion() to not change ABI.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@78285 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Tim Kosse
2014-12-20 10:15:51 +00:00
parent 2decc6f669
commit a2b3702934
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/msw/utils.cpp
View File

@@ -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;