AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Do not consider info from obsolete Windows versions.

Browse Source
This commit is contained in:
Catalin 2016-02-21 11:54:39 +02:00
parent 11319e0da2
commit 768aa0aef7
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/msw/utils.cpp
View File

@ -1079,10 +1079,6 @@ wxString wxGetOsDescription()
case 5: case 5:
switch ( info.dwMinorVersion ) switch ( info.dwMinorVersion )
{ {
case 0:
str = _("Windows 2000");
break;
case 2: case 2:
// we can't distinguish between XP 64 and 2003 // we can't distinguish between XP 64 and 2003
// as they both are 5.2, so examine the product // as they both are 5.2, so examine the product
@ -1138,7 +1134,7 @@ wxString wxGetOsDescription()
if ( str.empty() ) if ( str.empty() )
{ {
str.Printf(_("Windows NT %lu.%lu"), str.Printf(_("Windows %lu.%lu"),
info.dwMajorVersion, info.dwMajorVersion,
info.dwMinorVersion); info.dwMinorVersion);
} }
@ -1207,11 +1203,6 @@ wxOperatingSystemId wxGetOsVersion(int *verMaj, int *verMin)
{ {
case VER_PLATFORM_WIN32_NT: case VER_PLATFORM_WIN32_NT:
s_version.os = wxOS_WINDOWS_NT; s_version.os = wxOS_WINDOWS_NT;
break;
case VER_PLATFORM_WIN32_WINDOWS:
s_version.os = wxOS_WINDOWS_9X;
break;
} }
s_version.verMaj = info.dwMajorVersion; s_version.verMaj = info.dwMajorVersion;