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

Return Windows build number as micro version in wxGetOsVersion().

Browse Source
This commit is contained in:
Tobias Taschner
2016-02-26 16:11:17 +01:00
parent 066f540f51
commit 84fbc12f2d
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/msw/utils.cpp
View File

@@ -1244,7 +1244,8 @@ wxOperatingSystemId wxGetOsVersion(int *verMaj, int *verMin, int *verMicro)
wxOperatingSystemId os;
int verMaj,
verMin;
verMin,
verMicro;
} s_version;
// query the OS info only once as it's not supposed to change
@@ -1267,6 +1268,7 @@ wxOperatingSystemId wxGetOsVersion(int *verMaj, int *verMin, int *verMicro)
s_version.verMaj = info.dwMajorVersion;
s_version.verMin = info.dwMinorVersion;
s_version.verMicro = info.dwBuildNumber;
}
if ( verMaj )
@@ -1274,7 +1276,7 @@ wxOperatingSystemId wxGetOsVersion(int *verMaj, int *verMin, int *verMicro)
if ( verMin )
*verMin = s_version.verMin;
if ( verMicro )
*verMicro = 0;
*verMicro = s_version.verMicro;
return s_version.os;
}