recognize Vista by name in wxGetOsDescription()
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:
@@ -1121,24 +1121,37 @@ wxString wxGetOsDescription()
|
||||
break;
|
||||
|
||||
case VER_PLATFORM_WIN32_NT:
|
||||
if ( info.dwMajorVersion == 5 )
|
||||
switch ( info.dwMajorVersion )
|
||||
{
|
||||
switch ( info.dwMinorVersion )
|
||||
{
|
||||
case 0:
|
||||
str.Printf(_("Windows 2000 (build %lu"),
|
||||
case 5:
|
||||
switch ( info.dwMinorVersion )
|
||||
{
|
||||
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);
|
||||
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;
|
||||
}
|
||||
|
||||
if ( str.empty() )
|
||||
{
|
||||
str.Printf(_("Windows NT %lu.%lu (build %lu"),
|
||||
@@ -1146,6 +1159,7 @@ wxString wxGetOsDescription()
|
||||
info.dwMinorVersion,
|
||||
info.dwBuildNumber);
|
||||
}
|
||||
|
||||
if ( !wxIsEmpty(info.szCSDVersion) )
|
||||
{
|
||||
str << _T(", ") << info.szCSDVersion;
|
||||
|
Reference in New Issue
Block a user