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

Recognize Windows 7 and Server 2008 versions in wxGetOsDescription().

Browse Source 
Use marketing names for these systems instead of just describing them as
"Window NT x.y".

Closes #13220.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67752 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2011-05-16 10:01:08 +00:00
parent a699420104
commit 7c7eed5656
1 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/msw/utils.cpp
View File

@@ -1298,12 +1298,35 @@ wxString wxGetOsDescription()
break; break;
case 6: case 6:
if ( info.dwMinorVersion == 0 ) switch ( info.dwMinorVersion )
{
case 0:
if ( wxIsWindowsServer() == 1 )
{
str.Printf(_("Windows Server 2008 (build %lu"),
info.dwBuildNumber);
}
else
{ {
str.Printf(_("Windows Vista (build %lu"), str.Printf(_("Windows Vista (build %lu"),
info.dwBuildNumber); info.dwBuildNumber);
} }
break; break;
case 1:
if ( wxIsWindowsServer() == 1 )
{
str.Printf(_("Windows Server 2008 R2 (build %lu"),
info.dwBuildNumber);
}
else
{
str.Printf(_("Windows 7 (build %lu"),
info.dwBuildNumber);
}
break;
}
break;
} }
if ( str.empty() ) if ( str.empty() )