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

recognize Vista by name in wxGetOsDescription()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@53784 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-05-27 15:48:23 +00:00
parent 37f784703e
commit 805585b530
1 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/msw/utils.cpp
View File

@@ -1121,24 +1121,37 @@ wxString wxGetOsDescription()
break; break;
case VER_PLATFORM_WIN32_NT: case VER_PLATFORM_WIN32_NT:
if ( info.dwMajorVersion == 5 ) switch ( info.dwMajorVersion )
{ {
switch ( info.dwMinorVersion ) case 5:
{ switch ( info.dwMinorVersion )
case 0: {
str.Printf(_("Windows 2000 (build %lu"), case 0:
str.Printf(_("Windows 2000 (build %lu"),
info.dwBuildNumber);
break;
case 1:
str.Printf(_("Windows XP (build %lu"),
info.dwBuildNumber);
break;
case 2:
str.Printf(_("Windows Server 2003 (build %lu"),
info.dwBuildNumber);
break;
}
break;
case 6:
if ( info.dwMinorVersion == 0 )
{
str.Printf(_("Windows Vista (build %lu"),
info.dwBuildNumber); info.dwBuildNumber);
break; }
case 1: break;
str.Printf(_("Windows XP (build %lu"),
info.dwBuildNumber);
break;
case 2:
str.Printf(_("Windows Server 2003 (build %lu"),
info.dwBuildNumber);
break;
}
} }
if ( str.empty() ) if ( str.empty() )
{ {
str.Printf(_("Windows NT %lu.%lu (build %lu"), str.Printf(_("Windows NT %lu.%lu (build %lu"),
@@ -1146,6 +1159,7 @@ wxString wxGetOsDescription()
info.dwMinorVersion, info.dwMinorVersion,
info.dwBuildNumber); info.dwBuildNumber);
} }
if ( !wxIsEmpty(info.szCSDVersion) ) if ( !wxIsEmpty(info.szCSDVersion) )
{ {
str << _T(", ") << info.szCSDVersion; str << _T(", ") << info.szCSDVersion;